diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-11-08 20:09:35 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-11-08 20:09:35 +0100 |
| commit | f7ef93611cb2429ec3f1f5f77befcd1b5647be37 (patch) | |
| tree | 37a4899bac07800f753c89d44c115b9f570455ed /GNUmakefile | |
| parent | Hotfix for ThuGie's crash, with a sanity check in debug mode. (diff) | |
| download | cuberite-f7ef93611cb2429ec3f1f5f77befcd1b5647be37.tar cuberite-f7ef93611cb2429ec3f1f5f77befcd1b5647be37.tar.gz cuberite-f7ef93611cb2429ec3f1f5f77befcd1b5647be37.tar.bz2 cuberite-f7ef93611cb2429ec3f1f5f77befcd1b5647be37.tar.lz cuberite-f7ef93611cb2429ec3f1f5f77befcd1b5647be37.tar.xz cuberite-f7ef93611cb2429ec3f1f5f77befcd1b5647be37.tar.zst cuberite-f7ef93611cb2429ec3f1f5f77befcd1b5647be37.zip | |
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index fa7169ace..335b5a6fd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -97,10 +97,13 @@ INCLUDE = -I.\ -IiniFile\ -Itolua++-1.0.93/include\ -Ijsoncpp-src-0.5.0/include\ - -Ijsoncpp-src-0.5.0/src/lib_json\ - -Isquirrel_3_0_1_stable/include\ - -Isquirrel_3_0_1_stable\ - -Isquirrel_3_0_1_stable/sqrat + -Ijsoncpp-src-0.5.0/src/lib_json + + +# 2012_11_08 _X: Removed, see Globals.h +# -Isquirrel_3_0_1_stable/include\ +# -Isquirrel_3_0_1_stable\ +# -Isquirrel_3_0_1_stable/sqrat @@ -110,7 +113,9 @@ INCLUDE = -I.\ # Build MCServer # -SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source squirrel_3_0_1_stable tolua++-1.0.93 iniFile WebServer '(' -name '*.cpp' -o -name '*.c' ')') +# 2012_11_08 _X: Removed: squirrel_3_0_1_stable + +SOURCES := $(shell find CryptoPP 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)) |