summaryrefslogtreecommitdiff
path: root/src/login_sql
diff options
context:
space:
mode:
authorcodemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-20 20:11:23 +0000
committercodemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-20 20:11:23 +0000
commitbb83a7c114c17b67e9209fcda27b125192ce6b5a (patch)
tree439e10296b48951ea1c8d4558c0d2c31f31692ca /src/login_sql
parent73cb4a0ddaa2c29357acffcd0141af930d2f3149 (diff)
downloadhercules-bb83a7c114c17b67e9209fcda27b125192ce6b5a.tar.gz
hercules-bb83a7c114c17b67e9209fcda27b125192ce6b5a.tar.bz2
hercules-bb83a7c114c17b67e9209fcda27b125192ce6b5a.tar.xz
hercules-bb83a7c114c17b67e9209fcda27b125192ce6b5a.zip
* Updated makefiles to new strlib locations [Codemaster]
* Moved strlib.h and strlib.c into the common directory [Codemaster] * Updated a bit of jA 1081 - it's not completly updated yet!!! [Codemaster] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@681 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/login_sql')
-rw-r--r--src/login_sql/Makefile9
-rw-r--r--src/login_sql/login.c2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/login_sql/Makefile b/src/login_sql/Makefile
index 6fbb30865..18b023fe6 100644
--- a/src/login_sql/Makefile
+++ b/src/login_sql/Makefile
@@ -2,15 +2,14 @@ all: login-server_sql
sql: login-server_sql
shared_libs=all
-COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/malloc.h ../common/showmsg.h
+COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o ../common/strlib.o
+COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h
-login-server_sql: login.o md5calc.o strlib.o $(COMMON_OBJ)
+login-server_sql: login.o md5calc.o $(COMMON_OBJ)
$(CC) -o ../../$@ $^ $(LIB_S)
-login.o: login.c login.h md5calc.h strlib.h $(COMMON_H)
+login.o: login.c login.h md5calc.h $(COMMON_H)
md5calc.o: md5calc.c md5calc.h
-strlib.o: strlib.c strlib.h
clean:
rm -f *.o ../../login-server_sql
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index a8f2720bd..687eb3b37 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -44,7 +44,7 @@ void Gettimeofday(struct timeval *timenow)
//add include for DBMS(mysql)
#include <mysql.h>
-#include "strlib.h"
+#include "../common/strlib.h"
#include "timer.h"
/*
#include "timer.h"