summaryrefslogtreecommitdiffstats
path: root/GNUmakefile
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-11-24 15:31:36 +0100
committerAlexander Harkness <bearbin@gmail.com>2013-11-24 15:31:36 +0100
commit4e463d591d01d7fbccebd83cad416d1283e674d2 (patch)
treeda2df81dd1fcb878ac496633a81d55f8e9e9d342 /GNUmakefile
parentMoved tolua++ (diff)
downloadcuberite-4e463d591d01d7fbccebd83cad416d1283e674d2.tar
cuberite-4e463d591d01d7fbccebd83cad416d1283e674d2.tar.gz
cuberite-4e463d591d01d7fbccebd83cad416d1283e674d2.tar.bz2
cuberite-4e463d591d01d7fbccebd83cad416d1283e674d2.tar.lz
cuberite-4e463d591d01d7fbccebd83cad416d1283e674d2.tar.xz
cuberite-4e463d591d01d7fbccebd83cad416d1283e674d2.tar.zst
cuberite-4e463d591d01d7fbccebd83cad416d1283e674d2.zip
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile14
1 files changed, 2 insertions, 12 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 338470592..b1b6f222a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -62,23 +62,13 @@ LNK_OPTIONS = -pthread -ggdb -O3 -pg
BUILDDIR = build/profile/
else
-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
-BUILDDIR = build/pedantic/
-
-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
+CXX_OPTIONS = -s -ggdb -g -D_DEBUG -Og
+LNK_OPTIONS = -pthread -g -ggdb -Og
BUILDDIR = build/debug/
endif
endif