summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-27 00:15:32 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-27 00:15:32 +0100
commitb358032fe9095ddd92df4dd02dbab978ee408eb4 (patch)
tree0e45dd54f4fd6250af7fd8cdf89eccd15b8eb033
parentANOTHER compile fix (diff)
downloadcuberite-b358032fe9095ddd92df4dd02dbab978ee408eb4.tar
cuberite-b358032fe9095ddd92df4dd02dbab978ee408eb4.tar.gz
cuberite-b358032fe9095ddd92df4dd02dbab978ee408eb4.tar.bz2
cuberite-b358032fe9095ddd92df4dd02dbab978ee408eb4.tar.lz
cuberite-b358032fe9095ddd92df4dd02dbab978ee408eb4.tar.xz
cuberite-b358032fe9095ddd92df4dd02dbab978ee408eb4.tar.zst
cuberite-b358032fe9095ddd92df4dd02dbab978ee408eb4.zip
Diffstat (limited to '')
-rw-r--r--GNUmakefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 1e09ade98..f36ffe8bb 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -50,12 +50,12 @@ ifeq ($(release),1)
ifeq ($(disableofast),1)
CC_OPTIONS = -g -O3 -DNDEBUG
CXX_OPTIONS = -g -O3 -DNDEBUG
+ LNK_OPTIONS = -pthread -O3
else
CC_OPTIONS = -g -Ofast -DNDEBUG
CXX_OPTIONS = -g -Ofast -DNDEBUG
+ LNK_OPTIONS = -pthread -Ofast
endif
-
-LNK_OPTIONS = -pthread -Ofast
BUILDDIR = build/release/
else
@@ -67,12 +67,13 @@ ifeq ($(profile),1)
ifeq ($(disableofast),1)
CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
+ LNK_OPTIONS = -pthread -ggdb -O3 -pg
else
CC_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG
CXX_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG
+ LNK_OPTIONS = -pthread -ggdb -Ofast -pg
endif
-LNK_OPTIONS = -pthread -ggdb -Ofast -pg
BUILDDIR = build/profile/
else
@@ -81,7 +82,12 @@ else
# Since C code is used only for supporting libraries (zlib, lua), it is still Ofast-optimized
################
-CC_OPTIONS = -s -ggdb -g -D_DEBUG -Ofast
+ifeq ($(disableofast),1)
+ CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3
+else
+ CC_OPTIONS = -s -ggdb -g -D_DEBUG -Ofast
+endif
+
CXX_OPTIONS = -s -ggdb -g -D_DEBUG -Og
LNK_OPTIONS = -pthread -g -ggdb -Og
BUILDDIR = build/debug/