diff options
author | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-04 01:35:17 +0200 |
---|---|---|
committer | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-04 01:35:17 +0200 |
commit | b17d12c86f3e7414673d653396d2dce2e862b1e3 (patch) | |
tree | 95225ff23d64c0ea4a621401b841efe55b5a6169 /GNUmakefile | |
parent | Added planks into items.ini (diff) | |
download | cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.gz cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.bz2 cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.lz cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.xz cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.zst cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.zip |
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 25dd2b1b3..65945662a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -48,7 +48,7 @@ INCLUDE = -I.\ -Isource/packets\
-Itolua++-1.0.93/src/lib\
-Ilua-5.1.4/src\
- -Izlib-1.2.5\
+ -Izlib-1.2.7\
-IiniFile\
-Itolua++-1.0.93/include\
-Ijsoncpp-src-0.5.0/include\
@@ -58,7 +58,7 @@ INCLUDE = -I.\ # Build MCServer
#
-SOURCES := $(shell find lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.5 source tolua++-1.0.93 iniFile WebServer '(' -name '*.cpp' -o -name '*.c' ')')
+SOURCES := $(shell find lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile WebServer '(' -name '*.cpp' -o -name '*.c' ')')
SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES))
OBJECTS := $(patsubst %.c,$(BUILDDIR)%.o,$(SOURCES))
OBJECTS := $(patsubst %.cpp,$(BUILDDIR)%.o,$(OBJECTS))
|