- Changes in the VS8 project files:

  * synchronized the settings between the projects
  * joined all .h and .cpp files and grouped them based on the src subfolder (easier to understand how the source is organized)
  * added Debug/Release build targets that build txt/sql only
  * other minor changes

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9758 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 119 insertions, 96 deletions

diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj
index 9a64836cf..c899a1cac 100644
--- a/vcproj-8/map-server_txt.vcproj
+++ b/vcproj-8/map-server_txt.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-map"
-			IntermediateDirectory="Debug-map"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -49,7 +49,6 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				DefaultCharIsUnsigned="false"
-				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -69,12 +68,12 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/FIXED:NO"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib"
-				OutputFile="..\map-server.exe"
+				OutputFile="$(OutDir)\map-server.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -105,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-map"
-			IntermediateDirectory="Release-map"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -134,6 +133,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				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"
 				StringPooling="true"
@@ -158,15 +158,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib"
-				OutputFile="..\map-server.exe"
+				OutputFile="$(OutDir)\map-server.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\map-server.pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -199,56 +200,70 @@
 	</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"
 			>
 			<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
@@ -256,15 +271,15 @@
 				>
 			</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
@@ -272,11 +287,15 @@
 				>
 			</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
@@ -284,11 +303,15 @@
 				>
 			</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
@@ -296,7 +319,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\map\map.h"
 				>
 			</File>
 			<File
@@ -304,19 +327,27 @@
 				>
 			</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
@@ -324,6 +355,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\map\party.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\map\path.c"
 				>
 			</File>
@@ -332,11 +367,19 @@
 				>
 			</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
@@ -344,7 +387,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\map\script.h"
 				>
 			</File>
 			<File
@@ -352,7 +395,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.c"
+				RelativePath="..\src\map\skill.h"
 				>
 			</File>
 			<File
@@ -360,15 +403,15 @@
 				>
 			</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
@@ -376,107 +419,115 @@
 				>
 			</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="zlib"
 			>
 			<File
-				RelativePath="..\src\map\atcommand.h"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\battle.h"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\cbasetypes.h"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charcommand.h"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\charsave.h"
+				RelativePath="..\src\zlib\iowin32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chat.h"
+				RelativePath="..\src\zlib\unzip.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\chrif.h"
+				RelativePath="..\src\zlib\unzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\clif.h"
+				RelativePath="..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="common"
+			>
 			<File
-				RelativePath="..\src\map\date.h"
+				RelativePath="..\src\common\cbasetypes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\ers.h"
+				RelativePath="..\src\common\core.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\common\db.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\guild.h"
+				RelativePath="..\src\common\db.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\intif.h"
+				RelativePath="..\src\common\ers.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\irc.h"
+				RelativePath="..\src\common\ers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\itemdb.h"
+				RelativePath="..\src\common\grfio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\limits.h"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\common\lock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\log.h"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mail.h"
+				RelativePath="..\src\common\malloc.c"
 				>
 			</File>
 			<File
@@ -484,7 +535,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\map.h"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
 			<File
@@ -492,19 +543,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mercenary.h"
-				>
-			</File>
-			<File
 				RelativePath="..\src\common\mmo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\mob.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\npc.h"
+				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
@@ -512,23 +555,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\party.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\pc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\pcre.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\pet.h"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
@@ -536,7 +567,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\script.h"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
@@ -544,7 +575,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\skill.h"
+				RelativePath="..\src\common\socket.c"
 				>
 			</File>
 			<File
@@ -552,11 +583,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\status.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\storage.h"
+				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
@@ -564,15 +591,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\trade.h"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\unit.h"
+				RelativePath="..\src\common\utils.c"
 				>
 			</File>
 			<File
@@ -580,10 +607,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\map\vending.h"
-				>
-			</File>
-			<File
 				RelativePath="..\src\common\version.h"
 				>
 			</File>