diff options
Diffstat (limited to 'src/char_sql')
-rw-r--r-- | src/char_sql/Makefile | 9 | ||||
-rw-r--r-- | src/char_sql/char.c | 2 | ||||
-rw-r--r-- | src/char_sql/int_guild.c | 2 | ||||
-rw-r--r-- | src/char_sql/int_party.c | 2 | ||||
-rw-r--r-- | src/char_sql/int_pet.c | 2 | ||||
-rw-r--r-- | src/char_sql/inter.c | 2 | ||||
-rw-r--r-- | src/char_sql/make.sh | 3 |
7 files changed, 10 insertions, 12 deletions
diff --git a/src/char_sql/Makefile b/src/char_sql/Makefile index faf2bbb64..c58e2d59d 100644 --- a/src/char_sql/Makefile +++ b/src/char_sql/Makefile @@ -1,20 +1,19 @@ all: char-server_sql sql: char-server_sql -COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o ../common/utils.o -COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h +COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o ../common/utils.o ../common/strlib.o +COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h -char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o strlib.o itemdb.o $(COMMON_OBJ) +char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o itemdb.o $(COMMON_OBJ) $(CC) -o ../../$@ $^ $(LIB_S) -char.o: char.c char.h strlib.h itemdb.h ../common/showmsg.h +char.o: char.c char.h ../common/strlib.h itemdb.h ../common/showmsg.h inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h ../common/mmo.h char.h ../common/socket.h ../common/showmsg.h int_party.o: int_party.c int_party.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/timer.h ../common/db.h ../common/showmsg.h int_guild.o: int_guild.c int_guild.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/db.h ../common/showmsg.h int_storage.o: int_storage.c int_storage.h char.h itemdb.h ../common/showmsg.h int_pet.o: int_pet.c int_pet.h inter.h char.h ../common/mmo.h ../common/socket.h ../common/db.h ../common/showmsg.h -strlib.o: strlib.c strlib.h ../common/showmsg.h itemdb.o: itemdb.c itemdb.h ../common/db.h ../common/mmo.h ../common/showmsg.h $(COMMON_OBJ): $(COMMON_H) diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 1083235cf..a1318bcc1 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -34,7 +34,7 @@ #include <stdarg.h> #include "char.h" -#include "strlib.h" +#include "../common/strlib.h" #include "itemdb.h" #include "inter.h" #include "db.h" diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 85c301cd1..744465625 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -5,7 +5,7 @@ #include "char.h" -#include "strlib.h" +#include "../common/strlib.h" #include "int_storage.h" #include "inter.h" #include "int_guild.h" diff --git a/src/char_sql/int_party.c b/src/char_sql/int_party.c index ecc252185..ddcc8bb8d 100644 --- a/src/char_sql/int_party.c +++ b/src/char_sql/int_party.c @@ -4,7 +4,7 @@ // #include "char.h" -#include "strlib.h" +#include "../common/strlib.h" #include "socket.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/char_sql/int_pet.c b/src/char_sql/int_pet.c index 7f2ed2a7c..97548aeff 100644 --- a/src/char_sql/int_pet.c +++ b/src/char_sql/int_pet.c @@ -3,7 +3,7 @@ // SQL conversion by Jioh L. Jung // #include "char.h" -#include "strlib.h" +#include "../common/strlib.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c index 52d688dce..7dc76e0f6 100644 --- a/src/char_sql/inter.c +++ b/src/char_sql/inter.c @@ -7,7 +7,7 @@ #include <stdlib.h> #include "char.h" -#include "strlib.h" +#include "../common/strlib.h" #include "inter.h" #include "int_party.h" #include "int_guild.h" diff --git a/src/char_sql/make.sh b/src/char_sql/make.sh index a4ca8b5e4..6ee175f73 100644 --- a/src/char_sql/make.sh +++ b/src/char_sql/make.sh @@ -6,6 +6,5 @@ gcc -c int_pet.c -I/usr/local/include/mysql/ gcc -c int_storage.c -I/usr/local/include/mysql/ gcc -c inter.c -I/usr/local/include/mysql/ - gcc -c strlib.c gcc -c itemdb.c -I../common/ - gcc -o ../char-server inter.o char.o int_pet.o int_storage.o int_guild.o int_party.o strlib.o itemdb.o ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o -L/usr/local/lib/mysql -lmysqlclient -lz + gcc -o ../char-server inter.o char.o int_pet.o int_storage.o int_guild.o int_party.o ../common/strlib.o itemdb.o ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o -L/usr/local/lib/mysql -lmysqlclient -lz |