diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-12 15:24:20 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-12 15:24:20 +0000 |
| commit | 1427a87a2ad9a4fc947996fff2c7d85d265b67d3 (patch) | |
| tree | 1934d74b7c394395db385425ca0391562361812d /src/txt-converter | |
| parent | 00f7f9b9e2f72595e56af9c40d97fbd73408df54 (diff) | |
| download | hercules-1427a87a2ad9a4fc947996fff2c7d85d265b67d3.tar.gz hercules-1427a87a2ad9a4fc947996fff2c7d85d265b67d3.tar.bz2 hercules-1427a87a2ad9a4fc947996fff2c7d85d265b67d3.tar.xz hercules-1427a87a2ad9a4fc947996fff2c7d85d265b67d3.zip | |
- Minor changes to ers.
- Removed unused/hardly used cbasetypes typedefs.
- Updated txt-converter's makefile to include utils.o
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9473 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/txt-converter')
| -rw-r--r-- | src/txt-converter/Makefile | 4 | ||||
| -rw-r--r-- | src/txt-converter/char-converter.c | 2 | ||||
| -rw-r--r-- | src/txt-converter/login-converter.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/txt-converter/Makefile b/src/txt-converter/Makefile index 284f8dc81..2e40e838d 100644 --- a/src/txt-converter/Makefile +++ b/src/txt-converter/Makefile @@ -2,14 +2,14 @@ all sql: char-converter login-converter char-converter: char-converter.o ../common/obj/minicore.o \
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/strlib.o \
- ../common/obj/mapindex.o ../common/obj/ers.o \
+ ../common/obj/mapindex.o ../common/obj/ers.o ../common/obj/utils.o \
../char/char.o ../char/int_pet.o ../char/int_storage.o ../char/inter.o \
../char/int_party.o ../char/int_guild.o \
../char_sql/char.o ../char_sql/int_pet.o ../char_sql/int_storage.o \
../char_sql/inter.o ../char_sql/int_party.o ../char_sql/int_guild.o
$(CC) -o ../../tools/$@ $^ $(LIB_S)
-login-converter: login-converter.o ../common/obj/minicore.o ../common/obj/db.o ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/ers.o
+login-converter: login-converter.o ../common/obj/minicore.o ../common/obj/db.o ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/ers.o ../common/obj/utils.o
$(CC) -o ../../tools/$@ $^ $(LIB_S)
clean:
diff --git a/src/txt-converter/char-converter.c b/src/txt-converter/char-converter.c index 29d1c393f..6db1aceb6 100644 --- a/src/txt-converter/char-converter.c +++ b/src/txt-converter/char-converter.c @@ -5,9 +5,9 @@ #include <stdlib.h> #include <string.h> +#include "../common/mmo.h" #include "../common/core.h" #include "../common/strlib.h" -#include "../common/mmo.h" #include "../common/showmsg.h" #include "../common/mapindex.h" diff --git a/src/txt-converter/login-converter.c b/src/txt-converter/login-converter.c index ab236d322..840d61e1c 100644 --- a/src/txt-converter/login-converter.c +++ b/src/txt-converter/login-converter.c @@ -4,12 +4,16 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "cbasetypes.h" +#ifdef __WIN32 #include <my_global.h> +#include <my_sys.h> +#endif #include <mysql.h> +#include "../common/mmo.h" #include "../common/core.h" #include "../common/db.h" -#include "../common/mmo.h" struct auth_dat_ { int account_id, sex; |