summaryrefslogtreecommitdiffstats
path: root/GNUmakefile
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-26 23:37:44 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-26 23:37:44 +0100
commit2dee812667e1f86f65ad25430fae17e23baa784c (patch)
tree19cdea0d4d473fdac388a1e64e1963b484360a83 /GNUmakefile
parentFixed tolua++ files (diff)
downloadcuberite-2dee812667e1f86f65ad25430fae17e23baa784c.tar
cuberite-2dee812667e1f86f65ad25430fae17e23baa784c.tar.gz
cuberite-2dee812667e1f86f65ad25430fae17e23baa784c.tar.bz2
cuberite-2dee812667e1f86f65ad25430fae17e23baa784c.tar.lz
cuberite-2dee812667e1f86f65ad25430fae17e23baa784c.tar.xz
cuberite-2dee812667e1f86f65ad25430fae17e23baa784c.tar.zst
cuberite-2dee812667e1f86f65ad25430fae17e23baa784c.zip
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile23
1 files changed, 18 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 2ddfefee9..981809ffd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -47,8 +47,14 @@ ifeq ($(release),1)
# release build - fastest run-time, no gdb support
################
-CC_OPTIONS = -g -Ofast -DNDEBUG
-CXX_OPTIONS = -g -Ofast -DNDEBUG
+ifeq ($(disableasm),1)
+ CC_OPTIONS = -g -O3 -DNDEBUG
+ CXX_OPTIONS = -g -O3 -DNDEBUG
+else
+ CC_OPTIONS = -g -Ofast -DNDEBUG
+ CXX_OPTIONS = -g -Ofast -DNDEBUG
+endif
+
LNK_OPTIONS = -pthread -Ofast
BUILDDIR = build/release/
@@ -58,8 +64,14 @@ ifeq ($(profile),1)
# profile build - a release build with symbols and profiling engine built in
################
-CC_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG
-CXX_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG
+ifeq ($(disableasm),1)
+ CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
+ CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
+else
+ CC_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG
+ CXX_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG
+endif
+
LNK_OPTIONS = -pthread -ggdb -Ofast -pg
BUILDDIR = build/profile/
@@ -88,6 +100,7 @@ ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),0)
CC_OPTIONS += -Wno-tautological-compare
CXX_OPTIONS += -Wno-tautological-compare
disableasm = 1
+disableofast = 1
endif
@@ -141,7 +154,7 @@ INCLUDE = -I.\
-Isrc\
-Isrc/items\
-Isrce/blocks\
- -Ilib
+ -Ilib\