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, 134 insertions, 106 deletions

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>