flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Possibly fixed Linux makefile

Browse Source
This commit is contained in:
Tiger Wang 2013-11-26 22:37:44 +00:00
parent 1c526ed52b
commit 2dee812667
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
GNUmakefile
View File

@ -47,8 +47,14 @@ ifeq ($(release),1)
# release build - fastest run-time, no gdb support # release build - fastest run-time, no gdb support
################ ################
CC_OPTIONS = -g -Ofast -DNDEBUG ifeq ($(disableasm),1)
CXX_OPTIONS = -g -Ofast -DNDEBUG 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 LNK_OPTIONS = -pthread -Ofast
BUILDDIR = build/release/ BUILDDIR = build/release/
@ -58,8 +64,14 @@ ifeq ($(profile),1)
# profile build - a release build with symbols and profiling engine built in # profile build - a release build with symbols and profiling engine built in
################ ################
CC_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG ifeq ($(disableasm),1)
CXX_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG 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 LNK_OPTIONS = -pthread -ggdb -Ofast -pg
BUILDDIR = build/profile/ BUILDDIR = build/profile/
@ -88,6 +100,7 @@ ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),0)
CC_OPTIONS += -Wno-tautological-compare CC_OPTIONS += -Wno-tautological-compare
CXX_OPTIONS += -Wno-tautological-compare CXX_OPTIONS += -Wno-tautological-compare
disableasm = 1 disableasm = 1
disableofast = 1
endif endif
@ -141,7 +154,7 @@ INCLUDE = -I.\
-Isrc\ -Isrc\
-Isrc/items\ -Isrc/items\
-Isrce/blocks\ -Isrce/blocks\
-Ilib -Ilib\