diff options
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index f139b3d39..338470592 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -21,8 +21,11 @@ # Macros # +# allow user to override compiler +# if no compiler is specified make specifies cc +ifeq ($(CC),cc) CC = /usr/bin/g++ - +endif all: MCServer/MCServer @@ -82,6 +85,15 @@ endif endif +################################################### +# Fix Crypto++ warnings in clang + +ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),0) +CC_OPTIONS += -Wno-tautological-compare +CXX_OPTIONS += -Wno-tautological-compare +disableasm = 1 +endif + ################################################### # Set the link libraries based on the OS @@ -133,7 +145,6 @@ endif INCLUDE = -I.\ -Isource\ -Isource/md5\ - -IWebServer\ -Isource/items\ -Isource/blocks\ -Itolua++-1.0.93/src/lib\ @@ -155,7 +166,7 @@ INCLUDE = -I.\ # 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 expat '(' -name '*.cpp' -o -name '*.c' ')') +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 := $(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)) |