diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-22 21:37:51 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-22 21:37:51 +0000 |
| commit | c4211c14c145cc2e6b17516909cc2a2734781b00 (patch) | |
| tree | bcb20b0596a8b19ad1fd3505b196b37e1aaec6a8 | |
| parent | 162af4caa481eef2529ccdc1299d9578539143c9 (diff) | |
| download | hercules-c4211c14c145cc2e6b17516909cc2a2734781b00.tar.gz hercules-c4211c14c145cc2e6b17516909cc2a2734781b00.tar.bz2 hercules-c4211c14c145cc2e6b17516909cc2a2734781b00.tar.xz hercules-c4211c14c145cc2e6b17516909cc2a2734781b00.zip | |
Major reconfiguration of the vs7 project files (+vs8 while I was at it)
- added definitions _DEBUG and NDEBUG to tune system-specific stuff
- reduced the build requirements (Pentium 4 was a bit too much)
- changed build settings and project structure to match the vs8 projects
- corrected some vs8 inconsistencies
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10055 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | vcproj-7.1/char-server_sql.vcproj | 182 | ||||
| -rw-r--r-- | vcproj-7.1/char-server_txt.vcproj | 173 | ||||
| -rw-r--r-- | vcproj-7.1/login-server_sql.vcproj | 143 | ||||
| -rw-r--r-- | vcproj-7.1/login-server_txt.vcproj | 142 | ||||
| -rw-r--r-- | vcproj-7.1/map-server_sql.vcproj | 237 | ||||
| -rw-r--r-- | vcproj-7.1/map-server_txt.vcproj | 240 | ||||
| -rw-r--r-- | vcproj-7.1/mapcache.vcproj | 88 | ||||
| -rw-r--r-- | vcproj-8/char-server_sql.vcproj | 17 | ||||
| -rw-r--r-- | vcproj-8/char-server_txt.vcproj | 18 | ||||
| -rw-r--r-- | vcproj-8/login-server_sql.vcproj | 23 | ||||
| -rw-r--r-- | vcproj-8/login-server_txt.vcproj | 11 | ||||
| -rw-r--r-- | vcproj-8/map-server_sql.vcproj | 16 | ||||
| -rw-r--r-- | vcproj-8/map-server_txt.vcproj | 15 | ||||
| -rw-r--r-- | vcproj-8/mapcache.vcproj | 15 |
15 files changed, 787 insertions, 538 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7fb41aa1d..6c78c0458 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/03/23 + * Major reconfiguration of the vs7 project files (+vs8 while I was at it) + - added definitions _DEBUG and NDEBUG to tune system-specific stuff + - reduced the build requirements (Pentium 4 was a bit too much) + - changed build settings and project structure to match the vs8 projects + - corrected some vs8 inconsistencies * Some generic typo fixes [ultramage] * Corrected Ankle Snare/Spider Web having a 1% chance to trap rather than 100% diff --git a/vcproj-7.1/char-server_sql.vcproj b/vcproj-7.1/char-server_sql.vcproj index 3f711f8ca..ca0d54b6c 100644 --- a/vcproj-7.1/char-server_sql.vcproj +++ b/vcproj-7.1/char-server_sql.vcproj @@ -13,22 +13,23 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug-sqlchar" - IntermediateDirectory="Debug-sqlchar" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" - MinimalRebuild="FALSE" - BasicRuntimeChecks="0" - RuntimeLibrary="0" + MinimalRebuild="TRUE" + ExceptionHandling="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -38,13 +39,13 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib libmysql.lib zdll.lib" - OutputFile="../char-server_sql.exe" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" + OutputFile="$(OutDir)\char-server_sql.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" - IgnoreAllDefaultLibraries="FALSE" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" SubSystem="1" TargetMachine="1"/> <Tool @@ -70,14 +71,14 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release-sqlchar" - IntermediateDirectory="Release-sqlchar" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" - Optimization="3" + Optimization="2" GlobalOptimizations="TRUE" InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" @@ -85,12 +86,13 @@ FavorSizeOrSpeed="1" OmitFramePointers="TRUE" EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="3" + OptimizeForProcessor="2" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" - RuntimeLibrary="0" - DefaultCharIsUnsigned="TRUE" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="TRUE" + RuntimeLibrary="3" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -100,15 +102,18 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib libmysql.lib zdll.lib" - OutputFile="../char-server_sql.exe" + AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" + OutputFile="$(OutDir)\char-server_sql.exe" LinkIncremental="1" AdditionalLibraryDirectories="..\lib" + IgnoreAllDefaultLibraries="TRUE" IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -136,165 +141,186 @@ </References> <Files> <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + Name="char_sql" + Filter=""> <File RelativePath="..\src\char_sql\char.c"> </File> <File - RelativePath="..\src\common\core.c"> + RelativePath="..\src\char_sql\char.h"> </File> <File - RelativePath="..\src\common\db.c"> + RelativePath="..\src\char_sql\int_guild.c"> </File> <File - RelativePath="..\src\common\ers.c"> + RelativePath="..\src\char_sql\int_guild.h"> </File> <File - RelativePath="..\src\common\grfio.c"> + RelativePath="..\src\char_sql\int_homun.c"> </File> <File - RelativePath="..\src\char_sql\int_guild.c"> + RelativePath="..\src\char_sql\int_homun.h"> </File> <File - RelativePath="..\src\char_sql\int_homun.c"> + RelativePath="..\src\char_sql\int_party.c"> </File> <File - RelativePath="..\src\char_sql\int_party.c"> + RelativePath="..\src\char_sql\int_party.h"> </File> <File RelativePath="..\src\char_sql\int_pet.c"> </File> <File + RelativePath="..\src\char_sql\int_pet.h"> + </File> + <File RelativePath="..\src\char_sql\int_storage.c"> </File> <File - RelativePath="..\src\char_sql\inter.c"> + RelativePath="..\src\char_sql\int_storage.h"> </File> <File - RelativePath="..\src\zlib\ioapi.c"> + RelativePath="..\src\char_sql\inter.c"> </File> <File - RelativePath="..\src\zlib\iowin32.c"> + RelativePath="..\src\char_sql\inter.h"> </File> <File RelativePath="..\src\char_sql\itemdb.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - CompileAs="1"/> - </FileConfiguration> </File> <File - RelativePath="..\src\common\lock.c"> + RelativePath="..\src\char_sql\itemdb.h"> </File> + </Filter> + <Filter + Name="common" + Filter=""> <File - RelativePath="..\src\common\malloc.c"> + RelativePath="..\src\common\cbasetypes.h"> </File> <File - RelativePath="..\src\common\mapindex.c"> + RelativePath="..\src\common\core.c"> </File> <File - RelativePath="..\src\common\nullpo.c"> + RelativePath="..\src\common\core.h"> </File> <File - RelativePath="..\src\common\plugins.c"> + RelativePath="..\src\common\db.c"> </File> <File - RelativePath="..\src\common\showmsg.c"> + RelativePath="..\src\common\db.h"> </File> <File - RelativePath="..\src\common\socket.c"> + RelativePath="..\src\common\ers.c"> </File> <File - RelativePath="..\src\common\strlib.c"> + RelativePath="..\src\common\ers.h"> </File> <File - RelativePath="..\src\common\timer.c"> + RelativePath="..\src\common\grfio.c"> </File> <File - RelativePath="..\src\zlib\unzip.c"> + RelativePath="..\src\common\grfio.h"> </File> <File - RelativePath="..\src\common\utils.c"> + RelativePath="..\src\common\lock.c"> </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> <File - RelativePath="..\src\char_sql\char.h"> + RelativePath="..\src\common\lock.h"> </File> <File - RelativePath="..\src\common\core.h"> + RelativePath="..\src\common\malloc.c"> </File> <File - RelativePath="..\src\common\db.h"> + RelativePath="..\src\common\malloc.h"> </File> <File - RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\mapindex.c"> </File> <File - RelativePath="..\src\char_sql\int_guild.h"> + RelativePath="..\src\common\mapindex.h"> </File> <File - RelativePath="..\src\char_sql\int_homun.h"> + RelativePath="..\src\common\mmo.h"> </File> <File - RelativePath="..\src\char_sql\int_party.h"> + RelativePath="..\src\common\nullpo.c"> </File> <File - RelativePath="..\src\char_sql\int_pet.h"> + RelativePath="..\src\common\nullpo.h"> </File> <File - RelativePath="..\src\char_sql\int_storage.h"> + RelativePath="..\src\common\plugin.h"> </File> <File - RelativePath="..\src\char_sql\inter.h"> + RelativePath="..\src\common\plugins.c"> </File> <File - RelativePath="..\src\char_sql\itemdb.h"> + RelativePath="..\src\common\plugins.h"> </File> <File - RelativePath="..\src\common\lock.h"> + RelativePath="..\src\common\showmsg.c"> </File> <File - RelativePath="..\src\common\malloc.h"> + RelativePath="..\src\common\showmsg.h"> </File> <File - RelativePath="..\src\common\mapindex.h"> + RelativePath="..\src\common\socket.c"> </File> <File - RelativePath="..\src\common\mmo.h"> + RelativePath="..\src\common\socket.h"> </File> <File - RelativePath="..\src\common\nullpo.h"> + RelativePath="..\src\common\strlib.c"> </File> <File - RelativePath="..\src\common\plugin.h"> + RelativePath="..\src\common\strlib.h"> </File> <File - RelativePath="..\src\common\plugins.h"> + RelativePath="..\src\common\timer.c"> </File> <File - RelativePath="..\src\common\showmsg.h"> + RelativePath="..\src\common\timer.h"> </File> <File - RelativePath="..\src\common\socket.h"> + RelativePath="..\src\common\utils.c"> </File> <File - RelativePath="..\src\common\strlib.h"> + RelativePath="..\src\common\utils.h"> </File> <File - RelativePath="..\src\common\timer.h"> + RelativePath="..\src\common\version.h"> </File> + </Filter> + <Filter + Name="zlib" + Filter=""> <File - RelativePath="..\src\common\utils.h"> + RelativePath="..\src\zlib\crypt.h"> </File> <File - RelativePath="..\src\common\version.h"> + RelativePath="..\src\zlib\ioapi.c"> + </File> + <File + RelativePath="..\src\zlib\ioapi.h"> + </File> + <File + RelativePath="..\src\zlib\iowin32.c"> + </File> + <File + RelativePath="..\src\zlib\iowin32.h"> + </File> + <File + RelativePath="..\src\zlib\unzip.c"> + </File> + <File + RelativePath="..\src\zlib\unzip.h"> + </File> + <File + RelativePath="..\src\zlib\zconf.h"> + </File> + <File + RelativePath="..\src\zlib\zlib.h"> </File> </Filter> </Files> diff --git a/vcproj-7.1/char-server_txt.vcproj b/vcproj-7.1/char-server_txt.vcproj index 577e1f40e..a6d3a850f 100644 --- a/vcproj-7.1/char-server_txt.vcproj +++ b/vcproj-7.1/char-server_txt.vcproj @@ -4,6 +4,7 @@ Version="7.10" Name="char-server_txt" ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}" + RootNamespace="char-server_txt" Keyword="Win32Proj"> <Platforms> <Platform @@ -12,22 +13,23 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug-char" - IntermediateDirectory="Debug-char" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" - MinimalRebuild="FALSE" - BasicRuntimeChecks="0" - RuntimeLibrary="0" + MinimalRebuild="TRUE" + ExceptionHandling="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -37,13 +39,13 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib zdll.lib" - OutputFile="..\char-server.exe" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib zdll.lib" + OutputFile="$(OutDir)\char-server.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" - IgnoreAllDefaultLibraries="FALSE" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + ProgramDatabaseFile="$(OutDir)\char-server.pdb" SubSystem="1" TargetMachine="1"/> <Tool @@ -69,14 +71,14 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release-char" - IntermediateDirectory="Release-char" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" - Optimization="3" + Optimization="2" GlobalOptimizations="TRUE" InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" @@ -84,12 +86,13 @@ FavorSizeOrSpeed="1" OmitFramePointers="TRUE" EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="3" + OptimizeForProcessor="2" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" - RuntimeLibrary="0" - DefaultCharIsUnsigned="TRUE" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="TRUE" + RuntimeLibrary="3" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -99,14 +102,17 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib zdll.lib" - OutputFile="..\char-server.exe" + AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib" + OutputFile="$(OutDir)\char-server.exe" LinkIncremental="1" AdditionalLibraryDirectories="..\lib" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)\char-server.pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -134,159 +140,186 @@ </References> <Files> <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + Name="char_txt" + Filter=""> <File RelativePath="..\src\char\char.c"> </File> <File - RelativePath="..\src\common\core.c"> + RelativePath="..\src\char\char.h"> </File> <File - RelativePath="..\src\common\db.c"> + RelativePath="..\src\char\int_guild.c"> </File> <File - RelativePath="..\src\common\ers.c"> + RelativePath="..\src\char\int_guild.h"> </File> <File - RelativePath="..\src\common\grfio.c"> + RelativePath="..\src\char\int_homun.c"> </File> <File - RelativePath="..\src\char\int_guild.c"> + RelativePath="..\src\char\int_homun.h"> </File> <File RelativePath="..\src\char\int_party.c"> </File> <File - RelativePath="..\src\char\int_pet.c"> + RelativePath="..\src\char\int_party.h"> </File> <File RelativePath="..\src\char\int_pet.c"> </File> <File + RelativePath="..\src\char\int_pet.h"> + </File> + <File RelativePath="..\src\char\int_status.c"> </File> <File + RelativePath="..\src\char\int_status.h"> + </File> + <File RelativePath="..\src\char\int_storage.c"> </File> <File + RelativePath="..\src\char\int_storage.h"> + </File> + <File RelativePath="..\src\char\inter.c"> </File> <File - RelativePath="..\src\zlib\ioapi.c"> + RelativePath="..\src\char\inter.h"> </File> + </Filter> + <Filter + Name="common" + Filter=""> <File - RelativePath="..\src\zlib\iowin32.c"> + RelativePath="..\src\common\cbasetypes.h"> </File> <File - RelativePath="..\src\common\lock.c"> + RelativePath="..\src\common\core.c"> </File> <File - RelativePath="..\src\common\malloc.c"> + RelativePath="..\src\common\core.h"> </File> <File - RelativePath="..\src\common\mapindex.c"> + RelativePath="..\src\common\db.c"> </File> <File - RelativePath="..\src\common\nullpo.c"> + RelativePath="..\src\common\db.h"> </File> <File - RelativePath="..\src\common\plugins.c"> + RelativePath="..\src\common\ers.c"> </File> <File - RelativePath="..\src\common\showmsg.c"> + RelativePath="..\src\common\ers.h"> </File> <File - RelativePath="..\src\common\socket.c"> + RelativePath="..\src\common\grfio.c"> </File> <File - RelativePath="..\src\common\strlib.c"> + RelativePath="..\src\common\grfio.h"> </File> <File - RelativePath="..\src\common\timer.c"> + RelativePath="..\src\common\lock.c"> </File> <File - RelativePath="..\src\zlib\unzip.c"> + RelativePath="..\src\common\lock.h"> </File> <File - RelativePath="..\src\common\utils.c"> + RelativePath="..\src\common\malloc.c"> </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> <File - RelativePath="..\src\char\char.h"> + RelativePath="..\src\common\malloc.h"> </File> <File - RelativePath="..\src\common\core.h"> + RelativePath="..\src\common\mapindex.c"> </File> <File - RelativePath="..\src\common\db.h"> + RelativePath="..\src\common\mapindex.h"> </File> <File - RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\mmo.h"> </File> <File - RelativePath="..\src\char\int_guild.h"> + RelativePath="..\src\common\nullpo.c"> </File> <File - RelativePath="..\src\char\int_homun.c"> + RelativePath="..\src\common\nullpo.h"> </File> <File - RelativePath="..\src\char\int_party.h"> + RelativePath="..\src\common\plugin.h"> </File> <File - RelativePath="..\src\char\int_pet.h"> + RelativePath="..\src\common\plugins.c"> </File> <File - RelativePath="..\src\char\int_status.h"> + RelativePath="..\src\common\plugins.h"> </File> <File - RelativePath="..\src\char\int_storage.h"> + RelativePath="..\src\common\showmsg.c"> </File> <File - RelativePath="..\src\char\inter.h"> + RelativePath="..\src\common\showmsg.h"> </File> <File - RelativePath="..\src\common\lock.h"> + RelativePath="..\src\common\socket.c"> </File> <File - RelativePath="..\src\common\malloc.h"> + RelativePath="..\src\common\socket.h"> </File> <File - RelativePath="..\src\common\mapindex.h"> + RelativePath="..\src\common\strlib.c"> </File> <File - RelativePath="..\src\common\mmo.h"> + RelativePath="..\src\common\strlib.h"> </File> <File - RelativePath="..\src\common\nullpo.h"> + RelativePath="..\src\common\timer.c"> </File> <File - RelativePath="..\src\common\plugin.h"> + RelativePath="..\src\common\timer.h"> </File> <File - RelativePath="..\src\common\plugins.h"> + RelativePath="..\src\common\utils.c"> </File> <File - RelativePath="..\src\common\showmsg.h"> + RelativePath="..\src\common\utils.h"> </File> <File - RelativePath="..\src\common\socket.h"> + RelativePath="..\src\common\version.h"> </File> + </Filter> + <Filter + Name="zlib" + Filter=""> <File - RelativePath="..\src\common\strlib.h"> + RelativePath="..\src\zlib\crypt.h"> </File> <File - RelativePath="..\src\common\timer.h"> + RelativePath="..\src\zlib\ioapi.c"> </File> <File - RelativePath="..\src\common\utils.h"> + RelativePath="..\src\zlib\ioapi.h"> </File> <File - RelativePath="..\src\common\version.h"> + RelativePath="..\src\zlib\iowin32.c"> + </File> + <File + RelativePath="..\src\zlib\iowin32.h"> + </File> + <File + RelativePath="..\src\zlib\unzip.c"> + </File> + <File + RelativePath="..\src\zlib\unzip.h"> + </File> + <File + RelativePath="..\src\zlib\zconf.h"> + </File> + <File + RelativePath="..\src\zlib\zlib.h"> </File> </Filter> </Files> diff --git a/vcproj-7.1/login-server_sql.vcproj b/vcproj-7.1/login-server_sql.vcproj index 53b820647..7e350f4dc 100644 --- a/vcproj-7.1/login-server_sql.vcproj +++ b/vcproj-7.1/login-server_sql.vcproj @@ -12,22 +12,23 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug-sqllogin" - IntermediateDirectory="Debug-sqllogin" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" - MinimalRebuild="FALSE" - BasicRuntimeChecks="0" - RuntimeLibrary="0" + MinimalRebuild="TRUE" + ExceptionHandling="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -37,13 +38,13 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib libmysql.lib zdll.lib" - OutputFile="..\login-server_sql.exe" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" + OutputFile="$(OutDir)\login-server_sql.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" - IgnoreAllDefaultLibraries="FALSE" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" SubSystem="1" TargetMachine="1"/> <Tool @@ -69,14 +70,14 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release-sqllogin" - IntermediateDirectory="Release-sqllogin" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" - Optimization="3" + Optimization="2" GlobalOptimizations="TRUE" InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" @@ -84,12 +85,13 @@ FavorSizeOrSpeed="1" OmitFramePointers="TRUE" EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="3" + OptimizeForProcessor="2" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" - RuntimeLibrary="0" - DefaultCharIsUnsigned="TRUE" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="TRUE" + RuntimeLibrary="3" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" PrecompiledHeaderFile="" @@ -101,16 +103,18 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib libmysql.lib zdll.lib" - OutputFile="..\login-server_sql.exe" + AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" + OutputFile="$(OutDir)\login-server_sql.exe" LinkIncremental="1" AdditionalLibraryDirectories="..\lib" - IgnoreAllDefaultLibraries="FALSE" + IgnoreAllDefaultLibraries="TRUE" IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -138,117 +142,144 @@ </References> <Files> <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + Name="login_sql" + Filter=""> + <File + RelativePath="..\src\login_sql\login.c"> + </File> + <File + RelativePath="..\src\login_sql\login.h"> + </File> + </Filter> + <Filter + Name="common" + Filter=""> + <File + RelativePath="..\src\common\cbasetypes.h"> + </File> <File RelativePath="..\src\common\core.c"> </File> <File + RelativePath="..\src\common\core.h"> + </File> + <File RelativePath="..\src\common\db.c"> </File> <File + RelativePath="..\src\common\db.h"> + </File> + <File RelativePath="..\src\common\ers.c"> </File> <File - RelativePath="..\src\common\grfio.c"> + RelativePath="..\src\common\ers.h"> </File> <File - RelativePath="..\src\zlib\ioapi.c"> + RelativePath="..\src\common\grfio.c"> </File> <File - RelativePath="..\src\zlib\iowin32.c"> + RelativePath="..\src\common\grfio.h"> </File> <File RelativePath="..\src\common\lock.c"> </File> <File - RelativePath="..\src\login_sql\login.c"> + RelativePath="..\src\common\lock.h"> </File> <File RelativePath="..\src\common\malloc.c"> </File> <File + RelativePath="..\src\common\malloc.h"> + </File> + <File RelativePath="..\src\common\md5calc.c"> </File> <File + RelativePath="..\src\common\md5calc.h"> + </File> + <File + RelativePath="..\src\common\mmo.h"> + </File> + <File RelativePath="..\src\common\nullpo.c"> </File> <File - RelativePath="..\src\common\plugins.c"> + RelativePath="..\src\common\nullpo.h"> </File> <File - RelativePath="..\src\common\showmsg.c"> + RelativePath="..\src\common\plugin.h"> </File> <File - RelativePath="..\src\common\socket.c"> + RelativePath="..\src\common\plugins.c"> </File> <File - RelativePath="..\src\common\strlib.c"> + RelativePath="..\src\common\plugins.h"> </File> <File - RelativePath="..\src\common\timer.c"> + RelativePath="..\src\common\showmsg.c"> </File> <File - RelativePath="..\src\zlib\unzip.c"> + RelativePath="..\src\common\showmsg.h"> </File> <File - RelativePath="..\src\common\utils.c"> + RelativePath="..\src\common\socket.c"> </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> <File - RelativePath="..\src\common\core.h"> + RelativePath="..\src\common\socket.h"> </File> <File - RelativePath="..\src\common\db.h"> + RelativePath="..\src\common\strlib.c"> </File> <File - RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\strlib.h"> </File> <File - RelativePath="..\src\common\lock.h"> + RelativePath="..\src\common\timer.c"> </File> <File - RelativePath="..\src\login_sql\login.h"> + RelativePath="..\src\common\timer.h"> </File> <File - RelativePath="..\src\common\malloc.h"> + RelativePath="..\src\common\utils.c"> </File> <File - RelativePath="..\src\common\md5calc.h"> + RelativePath="..\src\common\utils.h"> </File> <File - RelativePath="..\src\common\mmo.h"> + RelativePath="..\src\common\version.h"> </File> + </Filter> + <Filter + Name="zlib" + Filter=""> <File - RelativePath="..\src\common\nullpo.h"> + RelativePath="..\src\zlib\crypt.h"> </File> <File - RelativePath="..\src\common\plugin.h"> + RelativePath="..\src\zlib\ioapi.c"> </File> <File - RelativePath="..\src\common\plugins.h"> + RelativePath="..\src\zlib\ioapi.h"> </File> <File - RelativePath="..\src\common\showmsg.h"> + RelativePath="..\src\zlib\iowin32.c"> </File> <File - RelativePath="..\src\common\socket.h"> + RelativePath="..\src\zlib\iowin32.h"> </File> <File - RelativePath="..\src\common\strlib.h"> + RelativePath="..\src\zlib\unzip.c"> </File> <File - RelativePath="..\src\common\timer.h"> + RelativePath="..\src\zlib\unzip.h"> </File> <File - RelativePath="..\src\common\utils.h"> + RelativePath="..\src\zlib\zconf.h"> </File> <File - RelativePath="..\src\common\version.h"> + RelativePath="..\src\zlib\zlib.h"> </File> </Filter> </Files> diff --git a/vcproj-7.1/login-server_txt.vcproj b/vcproj-7.1/login-server_txt.vcproj index 600751a4d..959e578cd 100644 --- a/vcproj-7.1/login-server_txt.vcproj +++ b/vcproj-7.1/login-server_txt.vcproj @@ -12,23 +12,24 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug-login" - IntermediateDirectory="Debug-login" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" - MinimalRebuild="FALSE" - BasicRuntimeChecks="0" - RuntimeLibrary="0" + MinimalRebuild="TRUE" + ExceptionHandling="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" DisableLanguageExtensions="FALSE" - DefaultCharIsUnsigned="TRUE" + DefaultCharIsUnsigned="FALSE" TreatWChar_tAsBuiltInType="FALSE" ForceConformanceInForLoopScope="FALSE" RuntimeTypeInfo="FALSE" @@ -42,14 +43,14 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib zdll.lib" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib zdll.lib" ShowProgress="0" - OutputFile="..\login-server.exe" + OutputFile="$(OutDir)\login-server.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" - IgnoreAllDefaultLibraries="FALSE" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + ProgramDatabaseFile="$(OutDir)\login-server.pdb" SubSystem="1" TargetMachine="1"/> <Tool @@ -75,14 +76,14 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release-login" - IntermediateDirectory="Release-login" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" - Optimization="3" + Optimization="2" GlobalOptimizations="TRUE" InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" @@ -90,12 +91,13 @@ FavorSizeOrSpeed="1" OmitFramePointers="TRUE" EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="3" + OptimizeForProcessor="2" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" - RuntimeLibrary="0" - DefaultCharIsUnsigned="TRUE" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="TRUE" + RuntimeLibrary="3" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -105,14 +107,17 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib zdll.lib" - OutputFile="..\login-server.exe" + AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib" + OutputFile="$(OutDir)\login-server.exe" LinkIncremental="1" AdditionalLibraryDirectories="..\lib" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)\login-server.pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -140,117 +145,144 @@ </References> <Files> <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + Name="login_txt" + Filter=""> + <File + RelativePath="..\src\login\login.c"> + </File> + <File + RelativePath="..\src\login\login.h"> + </File> + </Filter> + <Filter + Name="common" + Filter=""> + <File + RelativePath="..\src\common\cbasetypes.h"> + </File> <File RelativePath="..\src\common\core.c"> </File> <File + RelativePath="..\src\common\core.h"> + </File> + <File RelativePath="..\src\common\db.c"> </File> <File + RelativePath="..\src\common\db.h"> + </File> + <File RelativePath="..\src\common\ers.c"> </File> <File - RelativePath="..\src\common\grfio.c"> + RelativePath="..\src\common\ers.h"> </File> <File - RelativePath="..\src\zlib\ioapi.c"> + RelativePath="..\src\common\grfio.c"> </File> <File - RelativePath="..\src\zlib\iowin32.c"> + RelativePath="..\src\common\grfio.h"> </File> <File RelativePath="..\src\common\lock.c"> </File> <File - RelativePath="..\src\login\login.c"> + RelativePath="..\src\common\lock.h"> </File> <File RelativePath="..\src\common\malloc.c"> </File> <File + RelativePath="..\src\common\malloc.h"> + </File> + <File RelativePath="..\src\common\md5calc.c"> </File> <File + RelativePath="..\src\common\md5calc.h"> + </File> + <File + RelativePath="..\src\common\mmo.h"> + </File> + <File RelativePath="..\src\common\nullpo.c"> </File> <File - RelativePath="..\src\common\plugins.c"> + RelativePath="..\src\common\nullpo.h"> </File> <File - RelativePath="..\src\common\showmsg.c"> + RelativePath="..\src\common\plugin.h"> </File> <File - RelativePath="..\src\common\socket.c"> + RelativePath="..\src\common\plugins.c"> </File> <File - RelativePath="..\src\common\strlib.c"> + RelativePath="..\src\common\plugins.h"> </File> <File - RelativePath="..\src\common\timer.c"> + RelativePath="..\src\common\showmsg.c"> </File> <File - RelativePath="..\src\zlib\unzip.c"> + RelativePath="..\src\common\showmsg.h"> </File> <File - RelativePath="..\src\common\utils.c"> + RelativePath="..\src\common\socket.c"> </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> <File - RelativePath="..\src\common\core.h"> + RelativePath="..\src\common\socket.h"> </File> <File - RelativePath="..\src\common\db.h"> + RelativePath="..\src\common\strlib.c"> </File> <File - RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\strlib.h"> </File> <File - RelativePath="..\src\common\lock.h"> + RelativePath="..\src\common\timer.c"> </File> <File - RelativePath="..\src\login\login.h"> + RelativePath="..\src\common\timer.h"> </File> <File - RelativePath="..\src\common\malloc.h"> + RelativePath="..\src\common\utils.c"> </File> <File - RelativePath="..\src\common\md5calc.h"> + RelativePath="..\src\common\utils.h"> </File> <File - RelativePath="..\src\common\mmo.h"> + RelativePath="..\src\common\version.h"> </File> + </Filter> + <Filter + Name="zlib" + Filter=""> <File - RelativePath="..\src\common\nullpo.h"> + RelativePath="..\src\zlib\crypt.h"> </File> <File - RelativePath="..\src\common\plugin.h"> + RelativePath="..\src\zlib\ioapi.c"> </File> <File - RelativePath="..\src\common\plugins.h"> + RelativePath="..\src\zlib\ioapi.h"> </File> <File - RelativePath="..\src\common\showmsg.h"> + RelativePath="..\src\zlib\iowin32.c"> </File> <File - RelativePath="..\src\common\socket.h"> + RelativePath="..\src\zlib\iowin32.h"> </File> <File - RelativePath="..\src\common\strlib.h"> + RelativePath="..\src\zlib\unzip.c"> </File> <File - RelativePath="..\src\common\timer.h"> + RelativePath="..\src\zlib\unzip.h"> </File> <File - RelativePath="..\src\common\utils.h"> + RelativePath="..\src\zlib\zconf.h"> </File> <File - RelativePath="..\src\common\version.h"> + RelativePath="..\src\zlib\zlib.h"> </File> </Filter> </Files> diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj index 2fe58bb80..d9ba2a87f 100644 --- a/vcproj-7.1/map-server_sql.vcproj +++ b/vcproj-7.1/map-server_sql.vcproj @@ -12,22 +12,23 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug-sqlmap" - IntermediateDirectory="Debug-sqlmap" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;MAPREGSQL;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;MAPREGSQL;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" - MinimalRebuild="FALSE" - BasicRuntimeChecks="0" - RuntimeLibrary="0" + MinimalRebuild="TRUE" + ExceptionHandling="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" + DefaultCharIsUnsigned="FALSE" ForceConformanceInForLoopScope="FALSE" UsePrecompiledHeader="0" WarningLevel="3" @@ -38,14 +39,14 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib libmysql.lib pcre.lib zdll.lib" - OutputFile="..\map-server_sql.exe" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib libmysql.lib pcre.lib zdll.lib" + OutputFile="$(OutDir)\map-server_sql.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" - IgnoreAllDefaultLibraries="FALSE" + IgnoreAllDefaultLibraries="TRUE" IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" SubSystem="1" TargetMachine="1"/> <Tool @@ -71,14 +72,14 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release-sqlmap" - IntermediateDirectory="Release-sqlmap" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" - Optimization="3" + Optimization="2" GlobalOptimizations="TRUE" InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" @@ -86,12 +87,13 @@ FavorSizeOrSpeed="1" OmitFramePointers="TRUE" EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="3" + OptimizeForProcessor="2" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;MAPREGSQL;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" - RuntimeLibrary="0" - DefaultCharIsUnsigned="TRUE" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;MAPREGSQL;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="TRUE" + RuntimeLibrary="3" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -101,15 +103,18 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib libmysql.lib pcre.lib zdll.lib" - OutputFile="..\map-server_sql.exe" + AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib pcre.lib zdll.lib" + OutputFile="$(OutDir)\map-server_sql.exe" LinkIncremental="1" AdditionalLibraryDirectories="..\lib" + IgnoreAllDefaultLibraries="TRUE" IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -137,291 +142,315 @@ </References> <Files> <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + Name="map_sql" + Filter=""> <File RelativePath="..\src\map\atcommand.c"> </File> <File + RelativePath="..\src\map\atcommand.h"> + </File> + <File RelativePath="..\src\map\battle.c"> </File> <File + RelativePath="..\src\map\battle.h"> + </File> + <File RelativePath="..\src\map\charcommand.c"> </File> <File + RelativePath="..\src\map\charcommand.h"> + </File> + <File + RelativePath="..\src\map\charsave.c"> + </File> + <File + RelativePath="..\src\map\charsave.h"> + </File> + <File RelativePath="..\src\map\chat.c"> </File> <File - RelativePath="..\src\map\chrif.c"> + RelativePath="..\src\map\chat.h"> </File> <File - RelativePath="..\src\map\clif.c"> + RelativePath="..\src\map\chrif.c"> </File> <File - RelativePath="..\src\common\core.c"> + RelativePath="..\src\map\chrif.h"> </File> <File - RelativePath="..\src\map\date.c"> + RelativePath="..\src\map\clif.c"> </File> <File - RelativePath="..\src\common\db.c"> + RelativePath="..\src\map\clif.h"> </File> <File - RelativePath="..\src\common\ers.c"> + RelativePath="..\src\map\date.c"> </File> <File - RelativePath="..\src\common\grfio.c"> + RelativePath="..\src\map\date.h"> </File> <File RelativePath="..\src\map\guild.c"> </File> <File - RelativePath="..\src\map\intif.c"> + RelativePath="..\src\map\guild.h"> </File> <File - RelativePath="..\src\zlib\ioapi.c"> + RelativePath="..\src\map\intif.c"> </File> <File - RelativePath="..\src\zlib\iowin32.c"> + RelativePath="..\src\map\intif.h"> </File> <File RelativePath="..\src\map\irc.c"> </File> <File + RelativePath="..\src\map\irc.h"> + </File> + <File RelativePath="..\src\map\itemdb.c"> </File> <File - RelativePath="..\src\common\lock.c"> + RelativePath="..\src\map\itemdb.h"> </File> <File RelativePath="..\src\map\log.c"> </File> <File + RelativePath="..\src\map\log.h"> + </File> + <File RelativePath="..\src\map\mail.c"> </File> <File - RelativePath="..\src\common\malloc.c"> + RelativePath="..\src\map\mail.h"> </File> <File RelativePath="..\src\map\map.c"> </File> <File - RelativePath="..\src\common\mapindex.c"> + RelativePath="..\src\map\map.h"> </File> <File RelativePath="..\src\map\mercenary.c"> </File> <File + RelativePath="..\src\map\mercenary.h"> + </File> + <File RelativePath="..\src\map\mob.c"> </File> <File + RelativePath="..\src\map\mob.h"> + </File> + <File RelativePath="..\src\map\npc.c"> </File> <File - RelativePath="..\src\map\npc_chat.c"> + RelativePath="..\src\map\npc.h"> </File> <File - RelativePath="..\src\common\nullpo.c"> + RelativePath="..\src\map\npc_chat.c"> </File> <File RelativePath="..\src\map\party.c"> </File> <File + RelativePath="..\src\map\party.h"> + </File> + <File RelativePath="..\src\map\path.c"> </File> <File RelativePath="..\src\map\pc.c"> </File> <File + RelativePath="..\src\map\pc.h"> + </File> + <File + RelativePath="..\src\map\pcre.h"> + </File> + <File RelativePath="..\src\map\pet.c"> </File> <File - RelativePath="..\src\common\plugins.c"> + RelativePath="..\src\map\pet.h"> </File> <File RelativePath="..\src\map\script.c"> </File> <File - RelativePath="..\src\common\showmsg.c"> + RelativePath="..\src\map\script.h"> </File> <File RelativePath="..\src\map\skill.c"> </File> <File - RelativePath="..\src\common\socket.c"> + RelativePath="..\src\map\skill.h"> </File> <File RelativePath="..\src\map\status.c"> </File> <File - RelativePath="..\src\map\storage.c"> + RelativePath="..\src\map\status.h"> </File> <File - RelativePath="..\src\common\strlib.c"> + RelativePath="..\src\map\storage.c"> </File> <File - RelativePath="..\src\common\timer.c"> + RelativePath="..\src\map\storage.h"> </File> <File RelativePath="..\src\map\trade.c"> </File> <File - RelativePath="..\src\map\unit.c"> + RelativePath="..\src\map\trade.h"> </File> <File - RelativePath="..\src\zlib\unzip.c"> + RelativePath="..\src\map\unit.c"> </File> <File - RelativePath="..\src\common\utils.c"> + RelativePath="..\src\map\unit.h"> </File> <File RelativePath="..\src\map\vending.c"> </File> + <File + RelativePath="..\src\map\vending.h"> + </File> </Filter> <Filter - Name="Header Files" + Name="common" Filter=""> <File - RelativePath="..\src\map\atcommand.h"> - </File> - <File - RelativePath="..\src\map\battle.h"> - </File> - <File RelativePath="..\src\common\cbasetypes.h"> </File> <File - RelativePath="..\src\map\charcommand.h"> - </File> - <File - RelativePath="..\src\map\chat.h"> - </File> - <File - RelativePath="..\src\map\chrif.h"> - </File> - <File - RelativePath="..\src\map\clif.h"> + RelativePath="..\src\common\core.c"> </File> <File RelativePath="..\src\common\core.h"> </File> <File - RelativePath="..\src\map\date.h"> + RelativePath="..\src\common\db.c"> </File> <File RelativePath="..\src\common\db.h"> </File> <File - RelativePath="..\src\common\ers.h"> - </File> - <File - RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\ers.c"> </File> <File - RelativePath="..\src\map\guild.h"> + RelativePath="..\src\common\ers.h"> </File> <File - RelativePath="..\src\map\intif.h"> + RelativePath="..\src\common\grfio.c"> </File> <File - RelativePath="..\src\map\irc.h"> + RelativePath="..\src\common\grfio.h"> </File> <File - RelativePath="..\src\map\itemdb.h"> + RelativePath="..\src\common\lock.c"> </File> <File - RelativePath="..\src\common\limits.h"> + RelativePath="..\src\common\lock.h"> </File> <File - RelativePath="..\src\common\lock.h"> + RelativePath="..\src\common\malloc.c"> </File> <File - RelativePath="..\src\map\log.h"> + RelativePath="..\src\common\malloc.h"> </File> <File - RelativePath="..\src\map\mail.h"> + RelativePath="..\src\common\mapindex.c"> </File> <File - RelativePath="..\src\common\malloc.h"> + RelativePath="..\src\common\mapindex.h"> </File> <File - RelativePath="..\src\map\map.h"> + RelativePath="..\src\common\mmo.h"> </File> <File - RelativePath="..\src\common\mapindex.h"> + RelativePath="..\src\common\nullpo.c"> </File> <File - RelativePath="..\src\map\mercenary.h"> + RelativePath="..\src\common\nullpo.h"> </File> <File - RelativePath="..\src\common\mmo.h"> + RelativePath="..\src\common\plugin.h"> </File> <File - RelativePath="..\src\map\mob.h"> + RelativePath="..\src\common\plugins.c"> </File> <File - RelativePath="..\src\map\npc.h"> + RelativePath="..\src\common\plugins.h"> </File> <File - RelativePath="..\src\common\nullpo.h"> + RelativePath="..\src\common\showmsg.c"> </File> <File - RelativePath="..\src\map\party.h"> + RelativePath="..\src\common\showmsg.h"> </File> <File - RelativePath="..\src\map\pc.h"> + RelativePath="..\src\common\socket.c"> </File> <File - RelativePath="..\src\map\pcre.h"> + RelativePath="..\src\common\socket.h"> </File> <File - RelativePath="..\src\map\pet.h"> + RelativePath="..\src\common\strlib.c"> </File> <File - RelativePath="..\src\common\plugin.h"> + RelativePath="..\src\common\strlib.h"> </File> <File - RelativePath="..\src\common\plugins.h"> + RelativePath="..\src\common\timer.c"> </File> <File - RelativePath="..\src\map\script.h"> + RelativePath="..\src\common\timer.h"> </File> <File - RelativePath="..\src\common\showmsg.h"> + RelativePath="..\src\common\utils.c"> </File> <File - RelativePath="..\src\map\skill.h"> + RelativePath="..\src\common\utils.h"> </File> <File - RelativePath="..\src\common\socket.h"> + RelativePath="..\src\common\version.h"> </File> + </Filter> + <Filter + Name="zlib" + Filter=""> <File - RelativePath="..\src\map\status.h"> + RelativePath="..\src\zlib\crypt.h"> </File> <File - RelativePath="..\src\map\storage.h"> + RelativePath="..\src\zlib\ioapi.c"> </File> <File - RelativePath="..\src\common\strlib.h"> + RelativePath="..\src\zlib\ioapi.h"> </File> <File - RelativePath="..\src\common\timer.h"> + RelativePath="..\src\zlib\iowin32.c"> </File> <File - RelativePath="..\src\map\trade.h"> + RelativePath="..\src\zlib\iowin32.h"> </File> <File - RelativePath="..\src\map\unit.h"> + RelativePath="..\src\zlib\unzip.c"> </File> <File - RelativePath="..\src\common\utils.h"> + RelativePath="..\src\zlib\unzip.h"> </File> <File - RelativePath="..\src\map\vending.h"> + RelativePath="..\src\zlib\zconf.h"> </File> <File - RelativePath="..\src\common\version.h"> + RelativePath="..\src\zlib\zlib.h"> </File> </Filter> </Files> diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj index d611fff3f..69de24dec 100644 --- a/vcproj-7.1/map-server_txt.vcproj +++ b/vcproj-7.1/map-server_txt.vcproj @@ -12,23 +12,23 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug-map" - IntermediateDirectory="Debug-map" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" - MinimalRebuild="FALSE" - ExceptionHandling="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="0" + MinimalRebuild="TRUE" + ExceptionHandling="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" + DefaultCharIsUnsigned="FALSE" ForceConformanceInForLoopScope="FALSE" UsePrecompiledHeader="0" WarningLevel="3" @@ -40,13 +40,13 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/FIXED:NO" - AdditionalDependencies="WSOCK32.lib pcre.lib zdll.lib" - OutputFile="..\map-server.exe" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib pcre.lib zdll.lib" + OutputFile="$(OutDir)\map-server.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" - IgnoreAllDefaultLibraries="FALSE" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + ProgramDatabaseFile="$(OutDir)\map-server.pdb" SubSystem="1" TargetMachine="1"/> <Tool @@ -72,14 +72,14 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release-map" - IntermediateDirectory="Release-map" + OutputDirectory=".." + IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" - Optimization="3" + Optimization="2" GlobalOptimizations="TRUE" InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" @@ -87,13 +87,14 @@ FavorSizeOrSpeed="1" OmitFramePointers="TRUE" EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="3" + OptimizeForProcessor="2" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" - RuntimeLibrary="0" - EnableEnhancedInstructionSet="2" - DefaultCharIsUnsigned="TRUE" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;TXT_ONLY;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="TRUE" + RuntimeLibrary="3" + EnableEnhancedInstructionSet="0" + DefaultCharIsUnsigned="FALSE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="FALSE" @@ -103,14 +104,17 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="WSOCK32.lib zdll.lib pcre.lib" - OutputFile="..\map-server.exe" + AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib pcre.lib zdll.lib" + OutputFile="$(OutDir)\map-server.exe" LinkIncremental="1" AdditionalLibraryDirectories="..\lib" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)\map-server.pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -138,291 +142,315 @@ </References> <Files> <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + Name="map_txt" + Filter=""> <File RelativePath="..\src\map\atcommand.c"> </File> <File + RelativePath="..\src\map\atcommand.h"> + </File> + <File RelativePath="..\src\map\battle.c"> </File> <File + RelativePath="..\src\map\battle.h"> + </File> + <File RelativePath="..\src\map\charcommand.c"> </File> <File + RelativePath="..\src\map\charcommand.h"> + </File> + <File + RelativePath="..\src\map\charsave.c"> + </File> + <File + RelativePath="..\src\map\charsave.h"> + </File> + <File RelativePath="..\src\map\chat.c"> </File> <File - RelativePath="..\src\map\chrif.c"> + RelativePath="..\src\map\chat.h"> </File> <File - RelativePath="..\src\map\clif.c"> + RelativePath="..\src\map\chrif.c"> </File> <File - RelativePath="..\src\common\core.c"> + RelativePath="..\src\map\chrif.h"> </File> <File - RelativePath="..\src\map\date.c"> + RelativePath="..\src\map\clif.c"> </File> <File - RelativePath="..\src\common\db.c"> + RelativePath="..\src\map\clif.h"> </File> <File - RelativePath="..\src\common\ers.c"> + RelativePath="..\src\map\date.c"> </File> <File - RelativePath="..\src\common\grfio.c"> + RelativePath="..\src\map\date.h"> </File> <File RelativePath="..\src\map\guild.c"> </File> <File - RelativePath="..\src\map\intif.c"> + RelativePath="..\src\map\guild.h"> </File> <File - RelativePath="..\src\zlib\ioapi.c"> + RelativePath="..\src\map\intif.c"> </File> <File - RelativePath="..\src\zlib\iowin32.c"> + RelativePath="..\src\map\intif.h"> </File> <File RelativePath="..\src\map\irc.c"> </File> <File + RelativePath="..\src\map\irc.h"> + </File> + <File RelativePath="..\src\map\itemdb.c"> </File> <File - RelativePath="..\src\common\lock.c"> + RelativePath="..\src\map\itemdb.h"> </File> <File RelativePath="..\src\map\log.c"> </File> <File + RelativePath="..\src\map\log.h"> + </File> + <File RelativePath="..\src\map\mail.c"> </File> <File - RelativePath="..\src\common\malloc.c"> + RelativePath="..\src\map\mail.h"> </File> <File RelativePath="..\src\map\map.c"> </File> <File - RelativePath="..\src\common\mapindex.c"> + RelativePath="..\src\map\map.h"> </File> <File RelativePath="..\src\map\mercenary.c"> </File> <File + RelativePath="..\src\map\mercenary.h"> + </File> + <File RelativePath="..\src\map\mob.c"> </File> <File + RelativePath="..\src\map\mob.h"> + </File> + <File RelativePath="..\src\map\npc.c"> </File> <File - RelativePath="..\src\map\npc_chat.c"> + RelativePath="..\src\map\npc.h"> </File> <File - RelativePath="..\src\common\nullpo.c"> + RelativePath="..\src\map\npc_chat.c"> </File> <File RelativePath="..\src\map\party.c"> </File> <File + RelativePath="..\src\map\party.h"> + </File> + <File RelativePath="..\src\map\path.c"> </File> <File RelativePath="..\src\map\pc.c"> </File> <File + RelativePath="..\src\map\pc.h"> + </File> + <File + RelativePath="..\src\map\pcre.h"> + </File> + <File RelativePath="..\src\map\pet.c"> </File> <File - RelativePath="..\src\common\plugins.c"> + RelativePath="..\src\map\pet.h"> </File> <File RelativePath="..\src\map\script.c"> </File> <File - RelativePath="..\src\common\showmsg.c"> + RelativePath="..\src\map\script.h"> </File> <File RelativePath="..\src\map\skill.c"> </File> <File - RelativePath="..\src\common\socket.c"> + RelativePath="..\src\map\skill.h"> </File> <File RelativePath="..\src\map\status.c"> </File> <File - RelativePath="..\src\map\storage.c"> + RelativePath="..\src\map\status.h"> </File> <File - RelativePath="..\src\common\strlib.c"> + RelativePath="..\src\map\storage.c"> </File> <File - RelativePath="..\src\common\timer.c"> + RelativePath="..\src\map\storage.h"> </File> <File RelativePath="..\src\map\trade.c"> </File> <File - RelativePath="..\src\map\unit.c"> + RelativePath="..\src\map\trade.h"> </File> <File - RelativePath="..\src\zlib\unzip.c"> + RelativePath="..\src\map\unit.c"> </File> <File - RelativePath="..\src\common\utils.c"> + RelativePath="..\src\map\unit.h"> </File> <File RelativePath="..\src\map\vending.c"> </File> + <File + RelativePath="..\src\map\vending.h"> + </File> </Filter> <Filter - Name="Header Files" + Name="common" Filter=""> <File - RelativePath="..\src\map\atcommand.h"> - </File> - <File - RelativePath="..\src\map\battle.h"> - </File> - <File RelativePath="..\src\common\cbasetypes.h"> </File> <File - RelativePath="..\src\map\charcommand.h"> - </File> - <File - RelativePath="..\src\map\chat.h"> - </File> - <File - RelativePath="..\src\map\chrif.h"> - </File> - <File - RelativePath="..\src\map\clif.h"> + RelativePath="..\src\common\core.c"> </File> <File RelativePath="..\src\common\core.h"> </File> <File - RelativePath="..\src\map\date.h"> + RelativePath="..\src\common\db.c"> </File> <File RelativePath="..\src\common\db.h"> </File> <File - RelativePath="..\src\common\ers.h"> - </File> - <File - RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\ers.c"> </File> <File - RelativePath="..\src\map\guild.h"> + RelativePath="..\src\common\ers.h"> </File> <File - RelativePath="..\src\map\intif.h"> + RelativePath="..\src\common\grfio.c"> </File> <File - RelativePath="..\src\map\irc.h"> + RelativePath="..\src\common\grfio.h"> </File> <File - RelativePath="..\src\map\itemdb.h"> + RelativePath="..\src\common\lock.c"> </File> <File - RelativePath="..\src\common\limits.h"> + RelativePath="..\src\common\lock.h"> </File> <File - RelativePath="..\src\common\lock.h"> + RelativePath="..\src\common\malloc.c"> </File> <File - RelativePath="..\src\map\log.h"> + RelativePath="..\src\common\malloc.h"> </File> <File - RelativePath="..\src\map\mail.h"> + RelativePath="..\src\common\mapindex.c"> </File> <File - RelativePath="..\src\common\malloc.h"> + RelativePath="..\src\common\mapindex.h"> </File> <File - RelativePath="..\src\map\map.h"> + RelativePath="..\src\common\mmo.h"> </File> <File - RelativePath="..\src\common\mapindex.h"> + RelativePath="..\src\common\nullpo.c"> </File> <File - RelativePath="..\src\map\mercenary.h"> + RelativePath="..\src\common\nullpo.h"> </File> <File - RelativePath="..\src\common\mmo.h"> + RelativePath="..\src\common\plugin.h"> </File> <File - RelativePath="..\src\map\mob.h"> + RelativePath="..\src\common\plugins.c"> </File> <File - RelativePath="..\src\map\npc.h"> + RelativePath="..\src\common\plugins.h"> </File> <File - RelativePath="..\src\common\nullpo.h"> + RelativePath="..\src\common\showmsg.c"> </File> <File - RelativePath="..\src\map\party.h"> + RelativePath="..\src\common\showmsg.h"> </File> <File - RelativePath="..\src\map\pc.h"> + RelativePath="..\src\common\socket.c"> </File> <File - RelativePath="..\src\map\pcre.h"> + RelativePath="..\src\common\socket.h"> </File> <File - RelativePath="..\src\map\pet.h"> + RelativePath="..\src\common\strlib.c"> </File> <File - RelativePath="..\src\common\plugin.h"> + RelativePath="..\src\common\strlib.h"> </File> <File - RelativePath="..\src\common\plugins.h"> + RelativePath="..\src\common\timer.c"> </File> <File - RelativePath="..\src\map\script.h"> + RelativePath="..\src\common\timer.h"> </File> <File - RelativePath="..\src\common\showmsg.h"> + RelativePath="..\src\common\utils.c"> </File> <File - RelativePath="..\src\map\skill.h"> + RelativePath="..\src\common\utils.h"> </File> <File - RelativePath="..\src\common\socket.h"> + RelativePath="..\src\common\version.h"> </File> + </Filter> + <Filter + Name="zlib" + Filter=""> <File - RelativePath="..\src\map\status.h"> + RelativePath="..\src\zlib\crypt.h"> </File> <File - RelativePath="..\src\map\storage.h"> + RelativePath="..\src\zlib\ioapi.c"> </File> <File - RelativePath="..\src\common\strlib.h"> + RelativePath="..\src\zlib\ioapi.h"> </File> <File - RelativePath="..\src\common\timer.h"> + RelativePath="..\src\zlib\iowin32.c"> </File> <File - RelativePath="..\src\map\trade.h"> + RelativePath="..\src\zlib\iowin32.h"> </File> <File - RelativePath="..\src\map\unit.h"> + RelativePath="..\src\zlib\unzip.c"> </File> <File - RelativePath="..\src\common\utils.h"> + RelativePath="..\src\zlib\unzip.h"> </File> <File - RelativePath="..\src\map\vending.h"> + RelativePath="..\src\zlib\zconf.h"> </File> <File - RelativePath="..\src\common\version.h"> + RelativePath="..\src\zlib\zlib.h"> </File> </Filter> </Files> diff --git a/vcproj-7.1/mapcache.vcproj b/vcproj-7.1/mapcache.vcproj index 6a79895d1..38c8a9b24 100644 --- a/vcproj-7.1/mapcache.vcproj +++ b/vcproj-7.1/mapcache.vcproj @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1250"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="mapcache"
- ProjectGUID="{CB8556B8-9673-42FD-B2F6-3826534E64E2}"
+ ProjectGUID="{BB5C63F0-57AD-42F0-83F8-8F9323BC089C}"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -12,32 +12,38 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\"
- IntermediateDirectory="Debug"
+ OutputDirectory=".."
+ IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG"
MinimalRebuild="TRUE"
+ ExceptionHandling="FALSE"
BasicRuntimeChecks="3"
- RuntimeLibrary="5"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ EnableFunctionLevelLinking="TRUE"
+ DefaultCharIsUnsigned="FALSE"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ CompileAs="1"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="oldnames.lib ws2_32.lib zdll.lib"
- OutputFile="$(OutDir)/mapcache.exe"
+ AdditionalDependencies="msvcrtd.lib oldnames.lib zdll.lib"
+ OutputFile="$(OutDir)\mapcache.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\lib"
+ IgnoreAllDefaultLibraries="TRUE"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/mapcache.pdb"
+ ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
@@ -63,39 +69,48 @@ </Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\"
- IntermediateDirectory="Release"
+ OutputDirectory=".."
+ IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="TRUE">
<Tool
Name="VCCLCompilerTool"
+ Optimization="2"
GlobalOptimizations="TRUE"
+ InlineFunctionExpansion="2"
EnableIntrinsicFunctions="TRUE"
+ ImproveFloatingPointConsistency="TRUE"
FavorSizeOrSpeed="1"
+ OmitFramePointers="TRUE"
EnableFiberSafeOptimizations="TRUE"
- OptimizeForProcessor="3"
+ OptimizeForProcessor="2"
OptimizeForWindowsApplication="TRUE"
- AdditionalIncludeDirectories="..\src\common"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
- RuntimeLibrary="4"
- EnableEnhancedInstructionSet="1"
+ AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG"
+ StringPooling="TRUE"
+ RuntimeLibrary="3"
+ DefaultCharIsUnsigned="FALSE"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ CompileAs="1"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="oldnames.lib ws2_32.lib zdll.lib"
- OutputFile="$(OutDir)/mapcache.exe"
+ AdditionalDependencies="msvcrt.lib oldnames.lib zdll.lib"
+ OutputFile="$(OutDir)\mapcache.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\lib"
+ IgnoreAllDefaultLibraries="TRUE"
GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
@@ -123,42 +138,40 @@ </References>
<Files>
<Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ Name="mapcache"
+ Filter="">
<File
RelativePath="..\src\tool\grfio.c">
</File>
<File
- RelativePath="..\src\zlib\ioapi.c">
- </File>
- <File
- RelativePath="..\src\zlib\iowin32.c">
+ RelativePath="..\src\tool\grfio.h">
</File>
<File
RelativePath="..\src\tool\mapcache.c">
</File>
- <File
- RelativePath="..\src\zlib\unzip.c">
- </File>
</Filter>
<Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ Name="zlib"
+ Filter="">
<File
RelativePath="..\src\zlib\crypt.h">
</File>
<File
- RelativePath="..\src\tool\grfio.h">
+ RelativePath="..\src\zlib\ioapi.c">
</File>
<File
RelativePath="..\src\zlib\ioapi.h">
</File>
<File
+ RelativePath="..\src\zlib\iowin32.c">
+ </File>
+ <File
RelativePath="..\src\zlib\iowin32.h">
</File>
<File
+ RelativePath="..\src\zlib\unzip.c">
+ </File>
+ <File
RelativePath="..\src\zlib\unzip.h">
</File>
<File
@@ -168,11 +181,6 @@ RelativePath="..\src\zlib\zlib.h">
</File>
</Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj index 280e59105..5da1e3d82 100644 --- a/vcproj-8/char-server_sql.vcproj +++ b/vcproj-8/char-server_sql.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" MinimalRebuild="true" ExceptionHandling="0" @@ -67,7 +67,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" @@ -110,6 +110,7 @@ ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -136,7 +137,8 @@ EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="true" RuntimeLibrary="2" DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" @@ -167,6 +169,7 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -203,6 +206,10 @@ Name="common" > <File + RelativePath="..\src\common\cbasetypes.h" + > + </File> + <File RelativePath="..\src\common\core.c" > </File> @@ -223,6 +230,10 @@ > </File> <File + RelativePath="..\src\common\ers.h" + > + </File> + <File RelativePath="..\src\common\grfio.c" > </File> diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj index 5947caa83..6d1dac4fe 100644 --- a/vcproj-8/char-server_txt.vcproj +++ b/vcproj-8/char-server_txt.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8,00" + Version="8.00" Name="char-server_txt" ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}" RootNamespace="char-server_txt" @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" MinimalRebuild="true" ExceptionHandling="0" @@ -67,7 +67,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib zdll.lib" OutputFile="$(OutDir)\char-server.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" @@ -109,6 +109,7 @@ ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -135,7 +136,7 @@ EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" StringPooling="true" RuntimeLibrary="2" DefaultCharIsUnsigned="false" @@ -166,6 +167,7 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -266,6 +268,10 @@ Name="common" > <File + RelativePath="..\src\common\cbasetypes.h" + > + </File> + <File RelativePath="..\src\common\core.c" > </File> @@ -286,6 +292,10 @@ > </File> <File + RelativePath="..\src\common\ers.h" + > + </File> + <File RelativePath="..\src\common\grfio.c" > </File> diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj index 00d6dd3f6..ce79f7c1c 100644 --- a/vcproj-8/login-server_sql.vcproj +++ b/vcproj-8/login-server_sql.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8,00" + Version="8.00" Name="login-server_sql" ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}" RootNamespace="login-server_sql" @@ -42,12 +42,12 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" @@ -67,7 +67,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" @@ -110,6 +110,7 @@ ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -136,8 +137,9 @@ EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="true" + RuntimeLibrary="2" DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" @@ -169,6 +171,7 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -217,6 +220,10 @@ Name="common" > <File + RelativePath="..\src\common\cbasetypes.h" + > + </File> + <File RelativePath="..\src\common\core.c" > </File> @@ -237,6 +244,10 @@ > </File> <File + RelativePath="..\src\common\ers.h" + > + </File> + <File RelativePath="..\src\common\grfio.c" > </File> diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj index 5c58739a6..52680076c 100644 --- a/vcproj-8/login-server_txt.vcproj +++ b/vcproj-8/login-server_txt.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" MinimalRebuild="true" ExceptionHandling="0" @@ -66,7 +66,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib zdll.lib" ShowProgress="0" OutputFile="$(OutDir)\login-server.exe" LinkIncremental="2" @@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" StringPooling="true" RuntimeLibrary="2" DefaultCharIsUnsigned="false" @@ -166,6 +166,7 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -214,6 +215,10 @@ Name="common" > <File + RelativePath="..\src\common\cbasetypes.h" + > + </File> + <File RelativePath="..\src\common\core.c" > </File> diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj index 32f5bf519..e3dc56c96 100644 --- a/vcproj-8/map-server_sql.vcproj +++ b/vcproj-8/map-server_sql.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" MinimalRebuild="true" ExceptionHandling="0" @@ -66,7 +66,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" @@ -136,7 +136,8 @@ EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + StringPooling="true" RuntimeLibrary="2" DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" @@ -167,6 +168,7 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -399,6 +401,14 @@ > </File> <File + RelativePath="..\src\map\charsave.c" + > + </File> + <File + RelativePath="..\src\map\charsave.h" + > + </File> + <File RelativePath="..\src\map\chat.c" > </File> diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj index 212a981e2..00d644049 100644 --- a/vcproj-8/map-server_txt.vcproj +++ b/vcproj-8/map-server_txt.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" GeneratePreprocessedFile="0" MinimalRebuild="true" ExceptionHandling="0" @@ -67,7 +67,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/FIXED:NO" - AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib" + AdditionalDependencies="msvcrtd.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib" OutputFile="$(OutDir)\map-server.exe" LinkIncremental="2" AdditionalLibraryDirectories="..\lib" @@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\src\common;..\src\zlib" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="false" @@ -167,6 +167,7 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -227,6 +228,14 @@ > </File> <File + RelativePath="..\src\map\charsave.c" + > + </File> + <File + RelativePath="..\src\map\charsave.h" + > + </File> + <File RelativePath="..\src\map\chat.c" > </File> diff --git a/vcproj-8/mapcache.vcproj b/vcproj-8/mapcache.vcproj index f2db1a2da..f0cd4c4d6 100644 --- a/vcproj-8/mapcache.vcproj +++ b/vcproj-8/mapcache.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="mapcache"
ProjectGUID="{82A4EF25-7047-4DF1-A89C-94A6C73E0712}"
RootNamespace="mapcache"
@@ -41,7 +41,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\src\common;..\src\zlib"
- PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
ExceptionHandling="0"
@@ -67,13 +67,13 @@ <Tool
Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
- AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib"
+ AdditionalDependencies="msvcrtd.lib oldnames.lib zdll.lib"
OutputFile="$(OutDir)\mapcache.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\lib"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\mapcache.pdb"
+ ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
SubSystem="1"
TargetMachine="1"
/>
@@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\src\common;..\src\zlib"
- PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="false"
@@ -157,16 +157,17 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib"
+ AdditionalDependencies="msvcrt.lib oldnames.lib zdll.lib"
OutputFile="$(OutDir)\mapcache.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\lib"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\mapcache.pdb"
+ ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
LinkTimeCodeGeneration="1"
TargetMachine="1"
/>
|