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

1 files changed, 103 insertions, 70 deletions

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>