summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-11-13 20:41:05 +0100
committerAlexander Harkness <bearbin@gmail.com>2013-11-13 20:41:05 +0100
commit26ac6881cd5985eefe08fc7307f4d09442b68fd1 (patch)
tree42f586810ae3678cf66fc75ad883dccd1ee6727f
parentFixed link error with clang on x86_64. (diff)
downloadcuberite-26ac6881cd5985eefe08fc7307f4d09442b68fd1.tar
cuberite-26ac6881cd5985eefe08fc7307f4d09442b68fd1.tar.gz
cuberite-26ac6881cd5985eefe08fc7307f4d09442b68fd1.tar.bz2
cuberite-26ac6881cd5985eefe08fc7307f4d09442b68fd1.tar.lz
cuberite-26ac6881cd5985eefe08fc7307f4d09442b68fd1.tar.xz
cuberite-26ac6881cd5985eefe08fc7307f4d09442b68fd1.tar.zst
cuberite-26ac6881cd5985eefe08fc7307f4d09442b68fd1.zip
-rw-r--r--GNUmakefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile
index e056a61ec..de1da1455 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -46,6 +46,7 @@ ifeq ($(release),1)
################
# release build - fastest run-time, no gdb support
################
+
CC_OPTIONS = -s -g -O3 -DNDEBUG
CXX_OPTIONS = -s -g -O3 -DNDEBUG
LNK_OPTIONS = -pthread -O3
@@ -56,6 +57,7 @@ ifeq ($(profile),1)
################
# profile build - a release build with symbols and profiling engine built in
################
+
CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
LNK_OPTIONS = -pthread -ggdb -O3 -pg
@@ -66,6 +68,7 @@ ifeq ($(pedantic),1)
################
# pedantic build - basically a debug build with lots of warnings
################
+
CC_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long
CXX_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long
LNK_OPTIONS = -pthread -ggdb
@@ -76,6 +79,7 @@ else
# debug build - fully traceable by gdb in C++ code, slowest
# Since C code is used only for supporting libraries (zlib, lua), it is still O3-optimized
################
+
CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3
CXX_OPTIONS = -s -ggdb -g -D_DEBUG
LNK_OPTIONS = -pthread -g -ggdb
@@ -140,7 +144,6 @@ endif
###################################################
# INCLUDE directories for MCServer
-#
INCLUDE = -I.\
-Isource\
@@ -162,9 +165,6 @@ INCLUDE = -I.\
###################################################
# Build MCServer
-#
-
-# 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 expat '(' -name '*.cpp' -o -name '*.c' ')')
SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES))