summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-15 15:30:31 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-15 15:30:31 +0000
commitcbf1ea7211a92baf5877d5ea4673820640b68260 (patch)
tree65b6df22883d4ce0e92144c22113cc5f7e6c78cf
parent7ce8cd3af8480f5236497ccd59b75d221070927f (diff)
downloadhercules-cbf1ea7211a92baf5877d5ea4673820640b68260.tar.gz
hercules-cbf1ea7211a92baf5877d5ea4673820640b68260.tar.bz2
hercules-cbf1ea7211a92baf5877d5ea4673820640b68260.tar.xz
hercules-cbf1ea7211a92baf5877d5ea4673820640b68260.zip
Fix compile error
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@571 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt1
-rw-r--r--src/txt-converter/char/Makefile2
-rw-r--r--src/txt-converter/login/Makefile3
3 files changed, 4 insertions, 2 deletions
diff --git a/Changelog.txt b/Changelog.txt
index bcd349bdf..3a1ae0ef0 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
Date Added
12/15
+ * fix compile error in text converters [MouseJstr]
* Skill Updates [celest]
- Corrected traps to last longer in GvG
- Some minor changes to Hiding, Cloaking and Chasewalk to prevent it from
diff --git a/src/txt-converter/char/Makefile b/src/txt-converter/char/Makefile
index 56723ca5a..8d6d2c911 100644
--- a/src/txt-converter/char/Makefile
+++ b/src/txt-converter/char/Makefile
@@ -1,7 +1,7 @@
all: char-converter
sql: char-converter
-COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/db.o ../../common/malloc.o
+COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.o ../common/malloc.o ../common/showmsg.o
char-converter: char-converter.o strlib.o $(COMMON_OBJ)
$(CC) -o ../../../$@ $^ $(LIB_S)
diff --git a/src/txt-converter/login/Makefile b/src/txt-converter/login/Makefile
index 9f34e143a..84e269737 100644
--- a/src/txt-converter/login/Makefile
+++ b/src/txt-converter/login/Makefile
@@ -1,7 +1,8 @@
all: login-converter
sql: login-converter
-COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/db.o ../../common/malloc.o
+COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.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
login-converter: login-converter.o ../../login_sql/md5calc.o ../../login_sql/strlib.o $(COMMON_OBJ)