diff options
| author | Haru <haru@dotalux.com> | 2015-06-01 17:13:08 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-06-19 12:38:06 +0200 |
| commit | 080980071b952141275526f1745d8d74c10e4deb (patch) | |
| tree | 724303ad5623d22f23a861a3ca3052724577520c /src/tool | |
| parent | e81d221cdd79da16f5f013ecb45ecbff192971fe (diff) | |
| download | hercules-080980071b952141275526f1745d8d74c10e4deb.tar.gz hercules-080980071b952141275526f1745d8d74c10e4deb.tar.bz2 hercules-080980071b952141275526f1745d8d74c10e4deb.tar.xz hercules-080980071b952141275526f1745d8d74c10e4deb.zip | |
Removed ".." from include directives
- Include directives are now directory-independent.
- This will allow building plugins from other directories in future.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/tool')
| -rw-r--r-- | src/tool/Makefile.in | 9 | ||||
| -rw-r--r-- | src/tool/mapcache.c | 21 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index 2d7699db0..b0c07b2fb 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -9,13 +9,16 @@ 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) MAPCACHE_OBJ = obj_all/mapcache.o MAPCACHE_C = mapcache.c @@ -70,7 +73,7 @@ obj_all: obj_all/%.o: %.c $(MAPCACHE_H) $(COMMON_H) $(CONFIG_H) $(LIBCONFIG_H) | obj_all @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files $(COMMON_D)/obj_all/common_mini.a: diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c index 5cdaf6c94..6aa9bf273 100644 --- a/src/tool/mapcache.c +++ b/src/tool/mapcache.c @@ -3,21 +3,20 @@ #define HERCULES_CORE -#include "../config/core.h" // RENEWAL +#include "config/core.h" // RENEWAL + +#include "common/cbasetypes.h" +#include "common/core.h" +#include "common/grfio.h" +#include "common/malloc.h" +#include "common/mmo.h" +#include "common/showmsg.h" +#include "common/strlib.h" +#include "common/utils.h" #include <stdio.h> #include <stdlib.h> #include <string.h> - -#include "../common/cbasetypes.h" -#include "../common/core.h" -#include "../common/grfio.h" -#include "../common/malloc.h" -#include "../common/mmo.h" -#include "../common/showmsg.h" -#include "../common/utils.h" -#include "../common/strlib.h" - #ifndef _WIN32 #include <unistd.h> #endif |