Split off the 'common' code into a standalone 'common' project (msvc9).

Moved all the third-party dependencies (zlib, mysql) into 'common'. Moved txt converters into the sql build to remove the dependency on mysql in the txt build. git-svn-id: http://eathena.googlecode.com/svn/trunk@15204 9c4de8d1-4af9-ca9b-867f-b47ac08f6c80
eathena · Nov 4, 2012 · 4bbd85e · 4bbd85e
1 parent e16fd1c
commit 4bbd85e
Show file tree

Hide file tree

Showing 15 changed files with 637 additions and 1,243 deletions.
diff --git a/eAthena-9.sln b/eAthena-9.sln
@@ -1,27 +1,61 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_txt", "vcproj-9\map-server_txt.vcproj", "{D356871D-58E1-450B-967A-E1E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{413AF196-4A87-48F0-A459-36397CFE3A6C} = {413AF196-4A87-48F0-A459-36397CFE3A6C}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_txt", "vcproj-9\login-server_txt.vcproj", "{D356871D-58E1-450B-967A-E2E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{413AF196-4A87-48F0-A459-36397CFE3A6C} = {413AF196-4A87-48F0-A459-36397CFE3A6C}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj-9\char-server_txt.vcproj", "{D356871D-58E1-450B-967A-E3E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{413AF196-4A87-48F0-A459-36397CFE3A6C} = {413AF196-4A87-48F0-A459-36397CFE3A6C}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-9\char-server_sql.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BDE2D833-0F23-4C00-80B5-E60917551A24} = {BDE2D833-0F23-4C00-80B5-E60917551A24}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-9\login-server_sql.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BDE2D833-0F23-4C00-80B5-E60917551A24} = {BDE2D833-0F23-4C00-80B5-E60917551A24}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-9\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BDE2D833-0F23-4C00-80B5-E60917551A24} = {BDE2D833-0F23-4C00-80B5-E60917551A24}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-9\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{413AF196-4A87-48F0-A459-36397CFE3A6C} = {413AF196-4A87-48F0-A459-36397CFE3A6C}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-login", "vcproj-9\txt-converter-login.vcproj", "{D356871D-58E1-450B-967A-E9E9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BDE2D833-0F23-4C00-80B5-E60917551A24} = {BDE2D833-0F23-4C00-80B5-E60917551A24}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcproj-9\txt-converter-char.vcproj", "{D356871D-58E1-450B-967A-EAE9646175AF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BDE2D833-0F23-4C00-80B5-E60917551A24} = {BDE2D833-0F23-4C00-80B5-E60917551A24}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-console", "vcproj-9\plugin-console.vcproj", "{73E1101A-310C-4453-8F45-FD2795ABEF15}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-pid", "vcproj-9\plugin-pid.vcproj", "{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "vcproj-9\common.vcproj", "{413AF196-4A87-48F0-A459-36397CFE3A6C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_sql", "vcproj-9\common_sql.vcproj", "{BDE2D833-0F23-4C00-80B5-E60917551A24}"
+	ProjectSection(ProjectDependencies) = postProject
+		{413AF196-4A87-48F0-A459-36397CFE3A6C} = {413AF196-4A87-48F0-A459-36397CFE3A6C}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -107,31 +141,69 @@ Global
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-txt|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Release|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Release|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32
+		{D356871D-58E1-450B-967A-E9E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E9E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
+		{D356871D-58E1-450B-967A-EAE9646175AF}.Debug-sql|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-EAE9646175AF}.Debug-txt|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Release|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Release|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32
+		{D356871D-58E1-450B-967A-EAE9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-EAE9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-EAE9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug|Win32.ActiveCfg = Debug|Win32
 		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug|Win32.Build.0 = Debug|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug-sql|Win32.ActiveCfg = Debug|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug-sql|Win32.Build.0 = Debug|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug-txt|Win32.ActiveCfg = Debug|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug-txt|Win32.Build.0 = Debug|Win32
 		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.ActiveCfg = Release|Win32
 		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.Build.0 = Release|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Release-sql|Win32.ActiveCfg = Release|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Release-sql|Win32.Build.0 = Release|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Release-txt|Win32.ActiveCfg = Release|Win32
+		{73E1101A-310C-4453-8F45-FD2795ABEF15}.Release-txt|Win32.Build.0 = Release|Win32
 		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.Build.0 = Debug|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug-sql|Win32.ActiveCfg = Debug|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug-sql|Win32.Build.0 = Debug|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug-txt|Win32.ActiveCfg = Debug|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug-txt|Win32.Build.0 = Debug|Win32
 		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release|Win32.ActiveCfg = Release|Win32
 		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release|Win32.Build.0 = Release|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release-sql|Win32.ActiveCfg = Release|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release-sql|Win32.Build.0 = Release|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release-txt|Win32.ActiveCfg = Release|Win32
+		{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release-txt|Win32.Build.0 = Release|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Debug|Win32.Build.0 = Debug|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Debug-sql|Win32.ActiveCfg = Debug|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Debug-sql|Win32.Build.0 = Debug|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Debug-txt|Win32.ActiveCfg = Debug|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Debug-txt|Win32.Build.0 = Debug|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Release|Win32.ActiveCfg = Release|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Release|Win32.Build.0 = Release|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Release-sql|Win32.ActiveCfg = Release|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Release-sql|Win32.Build.0 = Release|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Release-txt|Win32.ActiveCfg = Release|Win32
+		{413AF196-4A87-48F0-A459-36397CFE3A6C}.Release-txt|Win32.Build.0 = Release|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Debug|Win32.Build.0 = Debug|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Debug-sql|Win32.ActiveCfg = Debug|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Debug-sql|Win32.Build.0 = Debug|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Debug-txt|Win32.ActiveCfg = Debug|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Release|Win32.ActiveCfg = Release|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Release|Win32.Build.0 = Release|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Release-sql|Win32.ActiveCfg = Release|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Release-sql|Win32.Build.0 = Release|Win32
+		{BDE2D833-0F23-4C00-80B5-E60917551A24}.Release-txt|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
@@ -342,4 +342,5 @@ int do_init(int argc, char** argv)
 void do_final(void) { }
 int parse_console(const char* buf) { return 0; }
 void set_server_type(void) { }
+void do_shutdown(void) { }
 void do_abort(void) { }
diff --git a/src/txt-converter/char-converter.c b/src/txt-converter/char-converter.c
@@ -304,4 +304,5 @@ int do_init(int argc, char** argv)
 void do_final(void) { }
 int parse_console(const char* buf) { return 0; }
 void set_server_type(void) { }
+void do_shutdown(void) { }
 void do_abort(void) { }
diff --git a/src/txt-converter/login-converter.c b/src/txt-converter/login-converter.c
@@ -110,4 +110,5 @@ void do_final(void)
 
 int parse_console(const char* buf) { return 0; }
 void set_server_type(void) { }
+void do_shutdown(void) { }
 void do_abort(void) { }
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj
@@ -43,9 +43,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\common;..\3rdparty\mysql\win32\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096"
-				GeneratePreprocessedFile="0"
+				AdditionalIncludeDirectories="..\src\common;..\3rdparty\msinttypes\include"
+				PreprocessorDefinitions="WIN32;_DEBUG"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -69,10 +68,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib"
+				AdditionalDependencies="libcmtd.lib oldnames.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\3rdparty\mysql\win32\lib"
+				AdditionalLibraryDirectories=""
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
@@ -138,8 +137,8 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\src\common;..\3rdparty\mysql\win32\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096"
+				AdditionalIncludeDirectories="..\src\common;..\3rdparty\msinttypes\include"
+				PreprocessorDefinitions="WIN32;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				DefaultCharIsUnsigned="false"
@@ -161,10 +160,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib"
+				AdditionalDependencies="libcmt.lib oldnames.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\3rdparty\mysql\win32\lib"
+				AdditionalLibraryDirectories=""
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
@@ -203,158 +202,6 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="3rdparty"
-			>
-			<File
-				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="common"
-			>
-			<File
-				RelativePath="..\src\common\cbasetypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\core.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\core.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\db.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\db.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\ers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\ers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\lock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\lock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\mapindex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\mapindex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\mmo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\nullpo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\plugin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\plugins.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\plugins.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\random.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\random.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\sql.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\sql.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\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="char_sql"
 			>