diff options
| author | Alexander Harkness <bearbin@gmail.com> | 2013-11-24 15:57:44 +0100 |
|---|---|---|
| committer | Alexander Harkness <bearbin@gmail.com> | 2013-11-24 15:57:44 +0100 |
| commit | a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0 (patch) | |
| tree | 3b01dab89774781a502881506401c3f9052a680c | |
| parent | Removed extra endif. (diff) | |
| download | cuberite-a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0.tar cuberite-a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0.tar.gz cuberite-a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0.tar.bz2 cuberite-a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0.tar.lz cuberite-a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0.tar.xz cuberite-a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0.tar.zst cuberite-a01d4a7b4a76a65395d8c6d04a3fb88eb5e505b0.zip | |
| -rw-r--r-- | GNUmakefile | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/GNUmakefile b/GNUmakefile index b1566cebc..ce5920e5b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -138,18 +138,11 @@ endif # INCLUDE directories for MCServer INCLUDE = -I.\ - -Isource\ - -Isource/md5\ - -Isource/items\ - -Isource/blocks\ - -Itolua++-1.0.93/src/lib\ - -Ilua-5.1.4/src\ - -Izlib-1.2.7\ - -IiniFile\ - -Itolua++-1.0.93/include\ - -Ijsoncpp-src-0.5.0/include\ - -Ijsoncpp-src-0.5.0/src/lib_json\ - -Iexpat + -Isrc\ + -Isrc/md5\ + -Isrc/items\ + -Isrce/blocks\ + -Ilib @@ -158,7 +151,7 @@ INCLUDE = -I.\ ################################################### # Build MCServer -SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile expat '(' -name '*.cpp' -o -name '*.c' ')') +SOURCES := $(shell find src lib '(' -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)) |