- 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, 82 insertions, 55 deletions

diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index 206677f97..280e59105 100644
--- a/vcproj-8/char-server_sql.vcproj
+++ b/vcproj-8/char-server_sql.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug-sqlchar"
-			IntermediateDirectory="Debug-sqlchar"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -45,6 +45,7 @@
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_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="3"
 				EnableFunctionLevelLinking="true"
@@ -67,13 +68,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
-				OutputFile="../char-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -104,8 +105,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release-sqlchar"
-			IntermediateDirectory="Release-sqlchar"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -127,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
+				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
@@ -156,13 +157,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
-				OutputFile="../char-server_sql.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -199,16 +200,14 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="common"
 			>
 			<File
-				RelativePath="..\src\char_sql\char.c"
+				RelativePath="..\src\common\core.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.c"
+				RelativePath="..\src\common\core.h"
 				>
 			</File>
 			<File
@@ -216,6 +215,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\db.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\ers.c"
 				>
 			</File>
@@ -224,63 +227,63 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_guild.c"
+				RelativePath="..\src\common\grfio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_homun.c"
+				RelativePath="..\src\common\lock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_party.c"
+				RelativePath="..\src\common\lock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_pet.c"
+				RelativePath="..\src\common\malloc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_storage.c"
+				RelativePath="..\src\common\malloc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\inter.c"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\ioapi.c"
+				RelativePath="..\src\common\mapindex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\iowin32.c"
+				RelativePath="..\src\common\mmo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\itemdb.c"
+				RelativePath="..\src\common\nullpo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.c"
+				RelativePath="..\src\common\nullpo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.c"
+				RelativePath="..\src\common\plugin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\common\plugins.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.c"
+				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.c"
+				RelativePath="..\src\common\showmsg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.c"
+				RelativePath="..\src\common\showmsg.h"
 				>
 			</File>
 			<File
@@ -288,119 +291,143 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\socket.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\strlib.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\strlib.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\timer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zlib\unzip.c"
+				RelativePath="..\src\common\timer.h"
 				>
 			</File>
 			<File
 				RelativePath="..\src\common\utils.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\version.h"
+				>
+			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
+			Name="zlib"
 			>
 			<File
-				RelativePath="..\src\char_sql\char.h"
+				RelativePath="..\src\zlib\crypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\core.h"
+				RelativePath="..\src\zlib\ioapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\db.h"
+				RelativePath="..\src\zlib\ioapi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\grfio.h"
+				RelativePath="..\src\zlib\iowin32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_guild.h"
+				RelativePath="..\src\zlib\iowin32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_homun.h"
+				RelativePath="..\src\zlib\unzip.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_party.h"
+				RelativePath="..\src\zlib\unzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_pet.h"
+				RelativePath="..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\int_storage.h"
+				RelativePath="..\src\zlib\zlib.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="char_sql"
+			>
 			<File
-				RelativePath="..\src\char_sql\inter.h"
+				RelativePath="..\src\char_sql\char.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\char_sql\itemdb.h"
+				RelativePath="..\src\char_sql\char.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\lock.h"
+				RelativePath="..\src\char_sql\int_guild.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\malloc.h"
+				RelativePath="..\src\char_sql\int_guild.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h"
+				RelativePath="..\src\char_sql\int_homun.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mmo.h"
+				RelativePath="..\src\char_sql\int_homun.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\nullpo.h"
+				RelativePath="..\src\char_sql\int_party.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugin.h"
+				RelativePath="..\src\char_sql\int_party.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\plugins.h"
+				RelativePath="..\src\char_sql\int_pet.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\showmsg.h"
+				RelativePath="..\src\char_sql\int_pet.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\socket.h"
+				RelativePath="..\src\char_sql\int_storage.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\strlib.h"
+				RelativePath="..\src\char_sql\int_storage.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\timer.h"
+				RelativePath="..\src\char_sql\inter.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\utils.h"
+				RelativePath="..\src\char_sql\inter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\version.h"
+				RelativePath="..\src\char_sql\itemdb.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char_sql\itemdb.h"
 				>
 			</File>
 		</Filter>