diff options
| author | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
| commit | 61f0dcb9a812d057e28c53837327f99bcea4733e (patch) | |
| tree | 76c299f94ef60fa6007321b8c403ebc93d8027c1 /src/map/Makefile.in | |
| parent | ec7241c953392938cd3a8740bacb4c869636766f (diff) | |
| parent | f2fbdc16a14d07e0895cc09eeba689bc556481d2 (diff) | |
| download | hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.gz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.bz2 hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.xz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.zip | |
Merge pull request #532 from MishimaHaruna/includes
Include paths
Diffstat (limited to 'src/map/Makefile.in')
| -rw-r--r-- | src/map/Makefile.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 90bb55694..ac1b4d837 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -9,18 +9,20 @@ CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common COMMON_H = $(wildcard $(COMMON_D)/*.h) SYSINFO_INC = $(COMMON_D)/sysinfo.inc +COMMON_INCLUDE = -I.. -LIBCONFIG_D = ../../3rdparty/libconfig +THIRDPARTY_D = ../../3rdparty +THIRDPARTY_INCLUDE = -I$(THIRDPARTY_D) + +LIBCONFIG_D = $(THIRDPARTY_D)/libconfig LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ scanner.o strbuf.o) LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ scanctx.h scanner.h strbuf.h wincompat.h) -LIBCONFIG_INCLUDE = -I$(LIBCONFIG_D) -MT19937AR_D = ../../3rdparty/mt19937ar +MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o MT19937AR_H = $(MT19937AR_D)/mt19937ar.h -MT19937AR_INCLUDE = -I$(MT19937AR_D) MAP_C = atcommand.c battle.c battleground.c buyingstore.c channel.c chat.c \ chrif.c clif.c date.c duel.c elemental.c guild.c homunculus.c HPMmap.c \ @@ -111,7 +113,7 @@ map-server: ../../map-server@EXEEXT@ obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files $(COMMON_D)/obj_all/common.a: |