summaryrefslogtreecommitdiff
path: root/src/tool
diff options
context:
space:
mode:
authorgepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-16 17:09:43 +0000
committergepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-16 17:09:43 +0000
commitc021f63e10a7dca24119e436e2450e0bbb2266a3 (patch)
tree481effe6e7aa8c7467b7bc6dc0e43570365515bd /src/tool
parent718ea60b21903731c02613164262f6b81d0e08fb (diff)
downloadhercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.tar.gz
hercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.tar.bz2
hercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.tar.xz
hercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.zip
- Removed outdated version number handling (follow-up to r11503).
- Fixed mapcache compilation issues in Linux. - Added some missing `svn:ignore` properties. - Moved `BLOCK_SIZE` definition from header to source file. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15586 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/tool')
-rw-r--r--src/tool/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index 8d14d9ed2..2ad022936 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -2,7 +2,7 @@
COMMON_OBJ = ../common/obj_all/minicore.o ../common/obj_all/malloc.o \
../common/obj_all/showmsg.o ../common/obj_all/strlib.o \
../common/obj_all/utils.o ../common/obj_all/des.o ../common/obj_all/grfio.o
-COMMON_H = ../common/core.h ../common/mmo.h ../common/version.h \
+COMMON_H = ../common/core.h ../common/mmo.h \
../common/malloc.h ../common/showmsg.h ../common/strlib.h \
../common/utils.h ../common/cbasetypes.h ../common/des.h ../common/grfio.h
@@ -40,8 +40,8 @@ help:
obj_all:
-mkdir obj_all
-obj_all/%.o: %.c $(COMMON_H)
- @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+obj_all/%.o: %.c $(COMMON_H) $(LIBCONFIG_H)
+ @CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o:
@@ -51,4 +51,4 @@ obj_all/%.o: %.c $(COMMON_H)
@$(MAKE) -C ../common txt
LIBCONFIG_OBJ:
- @$(MAKE) -C ../../3rdparty/libconfig \ No newline at end of file
+ @$(MAKE) -C ../../3rdparty/libconfig