From cb3e3fd4f999460e12d446223936e5fc7f92b505 Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 22 Mar 2007 21:37:51 +0000 Subject: [PATCH] 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://svn.code.sf.net/p/rathena/svn/trunk@10055 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 5 + vcproj-7.1/char-server_sql.vcproj | 250 ++++++++++-------- vcproj-7.1/char-server_txt.vcproj | 245 +++++++++-------- vcproj-7.1/login-server_sql.vcproj | 181 +++++++------ vcproj-7.1/login-server_txt.vcproj | 180 +++++++------ vcproj-7.1/map-server_sql.vcproj | 405 +++++++++++++++------------- vcproj-7.1/map-server_txt.vcproj | 408 +++++++++++++++-------------- vcproj-7.1/mapcache.vcproj | 106 ++++---- vcproj-8/char-server_sql.vcproj | 17 +- vcproj-8/char-server_txt.vcproj | 18 +- vcproj-8/login-server_sql.vcproj | 23 +- vcproj-8/login-server_txt.vcproj | 11 +- vcproj-8/map-server_sql.vcproj | 16 +- vcproj-8/map-server_txt.vcproj | 15 +- vcproj-8/mapcache.vcproj | 15 +- 15 files changed, 1072 insertions(+), 823 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7fb41aa1df..6c78c0458e 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 3f711f8ca8..ca0d54b6c6 100644 --- a/vcproj-7.1/char-server_sql.vcproj +++ b/vcproj-7.1/char-server_sql.vcproj @@ -13,22 +13,23 @@ @@ -136,160 +141,150 @@ + Name="char_sql" + Filter=""> - - - - - - + RelativePath="..\src\char_sql\char.h"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -297,6 +292,37 @@ RelativePath="..\src\common\version.h"> + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj-7.1/char-server_txt.vcproj b/vcproj-7.1/char-server_txt.vcproj index 577e1f40ee..a6d3a850ff 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"> @@ -134,99 +140,16 @@ + Name="char_txt" + Filter=""> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + RelativePath="..\src\char\int_guild.c"> @@ -234,54 +157,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -289,6 +291,37 @@ RelativePath="..\src\common\version.h"> + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj-7.1/login-server_sql.vcproj b/vcproj-7.1/login-server_sql.vcproj index 53b8206479..7e350f4dcc 100644 --- a/vcproj-7.1/login-server_sql.vcproj +++ b/vcproj-7.1/login-server_sql.vcproj @@ -12,22 +12,23 @@ @@ -138,112 +142,108 @@ + Name="login_sql" + Filter=""> + + + + + + + + + + + + + + - - + RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\lock.h"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -251,6 +251,37 @@ RelativePath="..\src\common\version.h"> + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj-7.1/login-server_txt.vcproj b/vcproj-7.1/login-server_txt.vcproj index 600751a4d3..959e578cd3 100644 --- a/vcproj-7.1/login-server_txt.vcproj +++ b/vcproj-7.1/login-server_txt.vcproj @@ -12,23 +12,24 @@ @@ -140,112 +145,108 @@ + Name="login_txt" + Filter=""> + + + + + + + + + + + + + + - - + RelativePath="..\src\common\grfio.h"> + RelativePath="..\src\common\lock.h"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -253,6 +254,37 @@ RelativePath="..\src\common\version.h"> + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj index 2fe58bb801..d9ba2a87fd 100644 --- a/vcproj-7.1/map-server_sql.vcproj +++ b/vcproj-7.1/map-server_sql.vcproj @@ -12,22 +12,23 @@ @@ -137,95 +142,124 @@ + Name="map_sql" + Filter=""> + + + + + + + + + + + + + + + RelativePath="..\src\map\clif.h"> - - - - + RelativePath="..\src\map\date.h"> + + - - + RelativePath="..\src\map\intif.h"> + + + RelativePath="..\src\map\itemdb.h"> + + + RelativePath="..\src\map\mail.h"> + RelativePath="..\src\map\map.h"> + + + + + + + RelativePath="..\src\map\party.c"> + RelativePath="..\src\map\party.h"> @@ -233,195 +267,190 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + RelativePath="..\src\map\script.c"> + RelativePath="..\src\map\skill.c"> + RelativePath="..\src\map\status.c"> + + - - + RelativePath="..\src\map\trade.c"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RelativePath="..\src\common\version.h"> + + + + + RelativePath="..\src\zlib\ioapi.c"> + + + + + + + + + + + + + + diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj index d611fff3f3..69de24dec4 100644 --- a/vcproj-7.1/map-server_txt.vcproj +++ b/vcproj-7.1/map-server_txt.vcproj @@ -12,23 +12,23 @@ @@ -138,95 +142,124 @@ + Name="map_txt" + Filter=""> + + + + + + + + + + + + + + + RelativePath="..\src\map\clif.h"> - - - - + RelativePath="..\src\map\date.h"> + + - - + RelativePath="..\src\map\intif.h"> + + + RelativePath="..\src\map\itemdb.h"> + + + RelativePath="..\src\map\mail.h"> + RelativePath="..\src\map\map.h"> + + + + + + + RelativePath="..\src\map\party.c"> + RelativePath="..\src\map\party.h"> @@ -234,195 +267,190 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + RelativePath="..\src\map\script.c"> + RelativePath="..\src\map\skill.c"> + RelativePath="..\src\map\status.c"> + + - - + RelativePath="..\src\map\trade.c"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RelativePath="..\src\common\version.h"> + + + + + RelativePath="..\src\zlib\ioapi.c"> + + + + + + + + + + + + + + diff --git a/vcproj-7.1/mapcache.vcproj b/vcproj-7.1/mapcache.vcproj index 6a79895d1e..38c8a9b24e 100644 --- a/vcproj-7.1/mapcache.vcproj +++ b/vcproj-7.1/mapcache.vcproj @@ -1,9 +1,9 @@ - + + DebugInformationFormat="4" + CompileAs="1"/> + DebugInformationFormat="3" + CompileAs="1"/> @@ -123,41 +138,39 @@ + Name="mapcache" + Filter=""> - - - - - - - - - - - - + + + + + + + + + + + + @@ -168,11 +181,6 @@ RelativePath="..\src\zlib\zlib.h"> - - diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj index 280e591059..5da1e3d823 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 @@ /> @@ -202,6 +205,10 @@ + + @@ -222,6 +229,10 @@ RelativePath="..\src\common\ers.c" > + + diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj index 5947caa838..6d1dac4fe6 100644 --- a/vcproj-8/char-server_txt.vcproj +++ b/vcproj-8/char-server_txt.vcproj @@ -1,7 +1,7 @@ @@ -265,6 +267,10 @@ + + @@ -285,6 +291,10 @@ RelativePath="..\src\common\ers.c" > + + diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj index 00d6dd3f6f..ce79f7c1cd 100644 --- a/vcproj-8/login-server_sql.vcproj +++ b/vcproj-8/login-server_sql.vcproj @@ -1,7 +1,7 @@ @@ -216,6 +219,10 @@ + + @@ -236,6 +243,10 @@ RelativePath="..\src\common\ers.c" > + + diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj index 5c58739a67..52680076cd 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 @@ /> @@ -213,6 +214,10 @@ + + diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj index 32f5bf519f..e3dc56c96a 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 @@ /> @@ -398,6 +400,14 @@ RelativePath="..\src\map\charcommand.h" > + + + + diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj index 212a981e27..00d6440493 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 @@ @@ -226,6 +227,14 @@ RelativePath="..\src\map\charcommand.h" > + + + + diff --git a/vcproj-8/mapcache.vcproj b/vcproj-8/mapcache.vcproj index f2db1a2da5..f0cd4c4d69 100644 --- a/vcproj-8/mapcache.vcproj +++ b/vcproj-8/mapcache.vcproj @@ -1,7 +1,7 @@ @@ -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 @@ />