summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-04 11:25:28 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-04 11:25:28 +0000
commit479f5a453ef9e02a9913a994c0e74ed101edc1e6 (patch)
tree6d199cce494dda930c01c31973df6e6f4953ba3d /src
parent3f9f1e465bd86b8f2143c84f9b95b58d14f408d9 (diff)
downloadhercules-479f5a453ef9e02a9913a994c0e74ed101edc1e6.tar.gz
hercules-479f5a453ef9e02a9913a994c0e74ed101edc1e6.tar.bz2
hercules-479f5a453ef9e02a9913a994c0e74ed101edc1e6.tar.xz
hercules-479f5a453ef9e02a9913a994c0e74ed101edc1e6.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/txt-converter/Makefile.in99
-rw-r--r--src/txt-converter/login-converter.c3
2 files changed, 77 insertions, 25 deletions
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"