From 4e463d591d01d7fbccebd83cad416d1283e674d2 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 24 Nov 2013 14:31:36 +0000 Subject: Removed pedantic build and added optimisation to debug builds. --- GNUmakefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 338470592..b1b6f222a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -61,24 +61,14 @@ CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG 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 -- cgit v1.2.3