From 479f5a453ef9e02a9913a994c0e74ed101edc1e6 Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 4 Aug 2008 11:25:28 +0000 Subject: Corrected project files / makefiles that were missing newly added .c file entries. Corrected a leftover _RJ setting in the vs6/vs7/vs8 txt login server project files. Reformatted the converters makefile. Added a crude vs9->vs8 project file converter to /tools. Synchronized vs8 project files using the converter tool. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13043 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/txt-converter/Makefile.in | 99 ++++++++++++++++++++++++++++--------- src/txt-converter/login-converter.c | 3 -- tools/vs9-to-vs8.php | 43 ++++++++++++++++ vcproj-6/login-server_txt.dsp | 2 +- vcproj-7.1/login-server_txt.vcproj | 4 +- vcproj-8/char-server_sql.vcproj | 11 +---- vcproj-8/char-server_txt.vcproj | 11 +---- vcproj-8/ladmin.vcproj | 9 ---- vcproj-8/login-server_sql.vcproj | 13 ++--- vcproj-8/login-server_txt.vcproj | 16 ++---- vcproj-8/map-server_sql.vcproj | 13 +---- vcproj-8/map-server_txt.vcproj | 13 +---- vcproj-8/mapcache.vcproj | 9 ---- vcproj-8/txt-converter-char.vcproj | 11 +++-- vcproj-8/txt-converter-login.vcproj | 39 +++++++++++---- 15 files changed, 175 insertions(+), 121 deletions(-) create mode 100644 tools/vs9-to-vs8.php diff --git a/src/txt-converter/Makefile.in b/src/txt-converter/Makefile.in index c90a6a4b2..41c773d31 100644 --- a/src/txt-converter/Makefile.in +++ b/src/txt-converter/Makefile.in @@ -1,29 +1,77 @@ - -LOGIN_CONVERTER_OBJ = obj_login/login-converter.o ../common/obj_all/minicore.o \ - ../common/obj_all/malloc.o ../common/obj_all/strlib.o ../common/obj_all/showmsg.o \ - ../common/obj_all/utils.o ../common/obj_all/ers.o ../common/obj_all/db.o \ +LOGIN_CONVERTER_OBJ = \ + obj_login/login-converter.o \ + ../login/obj_txt/account_txt.o \ + ../login/obj_sql/account_sql.o \ + ../common/obj_all/minicore.o \ + ../common/obj_all/db.o \ + ../common/obj_all/ers.o \ + ../common/obj_all/lock.o \ + ../common/obj_all/malloc.o \ + ../common/obj_all/showmsg.o \ + ../common/obj_all/strlib.o \ + ../common/obj_all/timer.o \ ../common/obj_sql/sql.o -LOGIN_CONVERTER_H = ../common/cbasetypes.h ../common/mmo.h ../common/core.h \ - ../common/malloc.h ../common/strlib.h ../common/showmsg.h \ - ../common/utils.h ../common/ers.h ../common/db.h \ +LOGIN_CONVERTER_H = \ + ../login/account.h \ + ../common/cbasetypes.h \ + ../common/mmo.h \ + ../common/core.h \ + ../common/db.h \ + ../common/ers.h \ + ../common/lock.h \ + ../common/malloc.h \ + ../common/showmsg.h \ + ../common/strlib.h \ + ../common/timer.h \ ../common/sql.h -CHAR_CONVERTER_OBJ = obj_char/char-converter.o \ - obj_char/txt-char.o obj_char/txt-int_pet.o obj_char/txt-int_storage.o obj_char/txt-inter.o \ - obj_char/txt-int_party.o obj_char/txt-int_guild.o \ - obj_char/sql-char.o obj_char/sql-int_pet.o obj_char/sql-int_storage.o \ - obj_char/sql-inter.o obj_char/sql-int_party.o obj_char/sql-int_guild.o \ +CHAR_CONVERTER_OBJ = \ + obj_char/char-converter.o \ + obj_char/txt-char.o \ + obj_char/txt-int_pet.o \ + obj_char/txt-int_storage.o \ + obj_char/txt-inter.o \ + obj_char/txt-int_party.o \ + obj_char/txt-int_guild.o \ + obj_char/sql-char.o \ + obj_char/sql-int_pet.o \ + obj_char/sql-int_storage.o \ + obj_char/sql-inter.o \ + obj_char/sql-int_party.o \ + obj_char/sql-int_guild.o \ ../common/obj_all/minicore.o \ - ../common/obj_all/malloc.o ../common/obj_all/strlib.o ../common/obj_all/showmsg.o \ - ../common/obj_all/utils.o ../common/obj_all/ers.o ../common/obj_all/mapindex.o \ + ../common/obj_all/malloc.o \ + ../common/obj_all/strlib.o \ + ../common/obj_all/showmsg.o \ + ../common/obj_all/utils.o \ + ../common/obj_all/timer.o \ + ../common/obj_all/ers.o \ + ../common/obj_all/mapindex.o \ ../common/obj_sql/sql.o -CHAR_CONVERTER_H = ../char/char.h ../char/int_pet.h ../char/int_storage.h ../char/inter.h \ - ../char/int_party.h ../char/int_guild.h \ - ../char_sql/char.h ../char_sql/int_pet.h ../char_sql/int_storage.h \ - ../char_sql/inter.h ../char_sql/int_party.h ../char_sql/int_guild.h \ - ../common/cbasetypes.h ../common/mmo.h ../common/core.h \ - ../common/malloc.h ../common/strlib.h ../common/showmsg.h \ - ../common/utils.h ../common/ers.h ../common/mapindex.h \ + +CHAR_CONVERTER_H = \ + ../char/char.h \ + ../char/int_pet.h \ + ../char/int_storage.h \ + ../char/inter.h \ + ../char/int_party.h \ + ../char/int_guild.h \ + ../char_sql/char.h \ + ../char_sql/int_pet.h \ + ../char_sql/int_storage.h \ + ../char_sql/inter.h \ + ../char_sql/int_party.h \ + ../char_sql/int_guild.h \ + ../common/cbasetypes.h \ + ../common/mmo.h \ + ../common/core.h \ + ../common/malloc.h \ + ../common/strlib.h \ + ../common/showmsg.h \ + ../common/timer.h \ + ../common/utils.h \ + ../common/ers.h \ + ../common/mapindex.h \ ../common/sql.h HAVE_MYSQL=@HAVE_MYSQL@ @@ -72,7 +120,7 @@ obj_char: -mkdir obj_char obj_login/%.o: %.c $(LOGIN_CONVERTER_H) - @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -DTXT_SQL_CONVERT -c $(OUTPUT_OPTION) $< + @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -DWITH_TXT -DWITH_SQL -c $(OUTPUT_OPTION) $< obj_char/%.o: %.c $(CHAR_CONVERTER_H) @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -DTXT_SQL_CONVERT -c $(OUTPUT_OPTION) $< @@ -89,3 +137,10 @@ obj_char/sql-%.o: ../char_sql/%.c $(CHAR_CONVERTER_H) ../common/obj_sql/%.o: @$(MAKE) -C ../common sql + +# missing login server files +../login/obj_txt/%.o: + @$(MAKE) -C ../login txt + +../login/obj_sql/%.o: + @$(MAKE) -C ../login sql diff --git a/src/txt-converter/login-converter.c b/src/txt-converter/login-converter.c index 78717287d..d72d35ae2 100644 --- a/src/txt-converter/login-converter.c +++ b/src/txt-converter/login-converter.c @@ -1,9 +1,6 @@ // (c) eAthena Dev Team - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#define WITH_TXT -#define WITH_SQL - #include "../common/cbasetypes.h" #include "../common/mmo.h" // struct mmo_account #include "../common/core.h" diff --git a/tools/vs9-to-vs8.php b/tools/vs9-to-vs8.php new file mode 100644 index 000000000..aa88379ff --- /dev/null +++ b/tools/vs9-to-vs8.php @@ -0,0 +1,43 @@ + + diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp index f1d604759..898273789 100644 --- a/vcproj-6/login-server_txt.dsp +++ b/vcproj-6/login-server_txt.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /D "ACCOUNTDB_ENGINE_0=rj" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c +# ADD CPP /nologo /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c # ADD BASE RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/vcproj-7.1/login-server_txt.vcproj b/vcproj-7.1/login-server_txt.vcproj index 37086403c..75c44a53b 100644 --- a/vcproj-7.1/login-server_txt.vcproj +++ b/vcproj-7.1/login-server_txt.vcproj @@ -19,7 +19,7 @@ - @@ -143,9 +140,9 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4800" /> @@ -191,9 +187,6 @@ - diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj index b18463c09..ac6529554 100644 --- a/vcproj-8/char-server_txt.vcproj +++ b/vcproj-8/char-server_txt.vcproj @@ -52,9 +52,9 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CompileAs="1" + DisableSpecificWarnings="4800" /> - @@ -142,9 +139,9 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4800" /> @@ -189,9 +185,6 @@ - diff --git a/vcproj-8/ladmin.vcproj b/vcproj-8/ladmin.vcproj index 43bd098ad..645d75556 100644 --- a/vcproj-8/ladmin.vcproj +++ b/vcproj-8/ladmin.vcproj @@ -51,7 +51,6 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CompileAs="1" /> @@ -95,9 +94,6 @@ - @@ -142,7 +138,6 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" /> @@ -167,7 +162,6 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" - OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -189,9 +183,6 @@ - diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj index 07531ce61..0afde87eb 100644 --- a/vcproj-8/login-server_sql.vcproj +++ b/vcproj-8/login-server_sql.vcproj @@ -1,7 +1,7 @@ - @@ -145,9 +142,9 @@ PrecompiledHeaderThrough="" PrecompiledHeaderFile="" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4100;4800" /> @@ -193,9 +189,6 @@ - diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj index 4ed7a7d61..fa454831f 100644 --- a/vcproj-8/login-server_txt.vcproj +++ b/vcproj-8/login-server_txt.vcproj @@ -39,9 +39,8 @@ /> - @@ -134,15 +130,15 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT;ACCOUNTDB_ENGINE_0=rj" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT" StringPooling="true" RuntimeLibrary="0" DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4100;4800" /> @@ -187,9 +182,6 @@ - diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj index 42abca317..dede60841 100644 --- a/vcproj-8/map-server_sql.vcproj +++ b/vcproj-8/map-server_sql.vcproj @@ -39,7 +39,6 @@ /> - @@ -129,7 +125,6 @@ /> @@ -192,9 +186,6 @@ - diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj index 0a017acdd..dbaa045c0 100644 --- a/vcproj-8/map-server_txt.vcproj +++ b/vcproj-8/map-server_txt.vcproj @@ -39,7 +39,6 @@ /> - @@ -128,7 +124,6 @@ /> @@ -191,9 +185,6 @@ - diff --git a/vcproj-8/mapcache.vcproj b/vcproj-8/mapcache.vcproj index 4e11d76d2..ca8ba377c 100644 --- a/vcproj-8/mapcache.vcproj +++ b/vcproj-8/mapcache.vcproj @@ -51,7 +51,6 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CompileAs="1" /> @@ -95,9 +94,6 @@ - @@ -142,7 +138,6 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" /> @@ -167,7 +162,6 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" - OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -189,9 +183,6 @@ - diff --git a/vcproj-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj index 608544d68..a30463c22 100644 --- a/vcproj-8/txt-converter-char.vcproj +++ b/vcproj-8/txt-converter-char.vcproj @@ -52,7 +52,6 @@ DefaultCharIsUnsigned="false" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CompileAs="1" /> @@ -142,7 +141,6 @@ PrecompiledHeaderThrough="" PrecompiledHeaderFile="" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" /> @@ -168,7 +166,6 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" - OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -309,6 +306,14 @@ RelativePath="..\src\common\strlib.h" > + + + + diff --git a/vcproj-8/txt-converter-login.vcproj b/vcproj-8/txt-converter-login.vcproj index da37608c8..2fb4d62a5 100644 --- a/vcproj-8/txt-converter-login.vcproj +++ b/vcproj-8/txt-converter-login.vcproj @@ -1,7 +1,7 @@ @@ -96,9 +95,6 @@ - @@ -145,7 +141,6 @@ PrecompiledHeaderThrough="" PrecompiledHeaderFile="" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="1" /> @@ -171,7 +166,6 @@ SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" - OptimizeForWindows98="1" LinkTimeCodeGeneration="1" TargetMachine="1" /> @@ -193,9 +187,6 @@ - @@ -231,6 +222,14 @@ RelativePath="..\src\common\ers.h" > + + + + @@ -263,7 +262,27 @@ RelativePath="..\src\common\strlib.h" > + + + + + + + + + + -- cgit v1.2.3-70-g09d2