diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-01 20:43:02 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-01 20:43:02 +0000 |
| commit | 6c4ccacfc199765bb6837da08341f6c7f21464bf (patch) | |
| tree | bb4e4b7eb6a2a489826b6e5308bd74791def6bd5 /src/tool/Makefile.in | |
| parent | 231c0084678af14b7443cbd47da99ebe380fe85c (diff) | |
| download | hercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.tar.gz hercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.tar.bz2 hercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.tar.xz hercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.zip | |
* Updates to map cache generator tool.
- Removed unmaintained grfio library copy and made the tool use the one in /common instead (related r12726).
- Updated makefile to use compile options/libraries determined by configure (bugreport:1109).
- Fixed error messages from the tool and grfio library overlapping each other (bugreport:2403).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14646 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/tool/Makefile.in')
| -rw-r--r-- | src/tool/Makefile.in | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index 61a54709d..06813f843 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -1,4 +1,13 @@ +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/grfio.o +COMMON_H = ../common/core.h ../common/mmo.h ../common/version.h \ + ../common/malloc.h ../common/showmsg.h ../common/strlib.h \ + ../common/utils.h ../common/cbasetypes.h ../common/grfio.h + +MAPCACHE_OBJ = obj_all/mapcache.o + @SET_MAKE@ ##################################################################### @@ -6,11 +15,11 @@ all: mapcache -mapcache: - @CC@ -o ../../mapcache@EXEEXT@ mapcache.c grfio.c -lz +mapcache: obj_all $(MAPCACHE_OBJ) $(COMMON_OBJ) + @CC@ @LDFLAGS@ -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) @LIBS@ clean: - rm -rf *.o ../../mapcache@EXEEXT@ + rm -rf obj_all/*.o ../../mapcache@EXEEXT@ help: @echo "possible targets are 'mapcache' 'all' 'clean' 'help'" @@ -20,3 +29,16 @@ help: @echo "'help' - outputs this message" ##################################################################### + +obj_all: + -mkdir obj_all + +obj_all/%.o: %.c $(COMMON_H) + @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + +# missing common object files +../common/obj_all/%.o: + @$(MAKE) -C ../common txt + +../common/obj_all/mini%.o: + @$(MAKE) -C ../common txt |