From b17d12c86f3e7414673d653396d2dce2e862b1e3 Mon Sep 17 00:00:00 2001 From: "cedeel@gmail.com" Date: Sun, 3 Jun 2012 23:35:17 +0000 Subject: Updated zlib, added chat formatting, fixed upside down stairs and slabs, fixed makefiles, hopefully updated vc project files git-svn-id: http://mc-server.googlecode.com/svn/trunk@546 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'GNUmakefile') 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)) -- cgit v1.2.3