diff options
| author | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-20 20:11:23 +0000 |
|---|---|---|
| committer | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-20 20:11:23 +0000 |
| commit | bb83a7c114c17b67e9209fcda27b125192ce6b5a (patch) | |
| tree | 439e10296b48951ea1c8d4558c0d2c31f31692ca /src/txt-converter/char | |
| parent | 73cb4a0ddaa2c29357acffcd0141af930d2f3149 (diff) | |
| download | hercules-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/txt-converter/char')
| -rw-r--r-- | src/txt-converter/char/Makefile | 8 | ||||
| -rw-r--r-- | src/txt-converter/char/char-converter.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/txt-converter/char/Makefile b/src/txt-converter/char/Makefile index 4dd3db689..a4cca87fd 100644 --- a/src/txt-converter/char/Makefile +++ b/src/txt-converter/char/Makefile @@ -1,13 +1,13 @@ all: char-converter sql: char-converter -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_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/strlib.o -char-converter: char-converter.o strlib.o $(COMMON_OBJ) +char-converter: char-converter.o $(COMMON_OBJ) $(CC) -o ../../../$@ $^ $(LIB_S) -char-converter.o: char-converter.c char.h strlib.h -strlib.o: strlib.c strlib.h +char-converter.o: char-converter.c char.h ../../common/strlib.h +strlib.o: strlib.c ../../common/strlib.h clean: rm -f *.o ../../../char-converter diff --git a/src/txt-converter/char/char-converter.c b/src/txt-converter/char/char-converter.c index 8928e240f..7b35fda63 100644 --- a/src/txt-converter/char/char-converter.c +++ b/src/txt-converter/char/char-converter.c @@ -18,7 +18,7 @@ #define STORAGE_MEMINC 16 #include "char.h" -#include "strlib.h" +#include "../../common/strlib.h" #ifdef MEMWATCH #include "memwatch.h" |