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

Fixed some of the comments in the makefile.

Browse Source
This commit is contained in:
Alexander Harkness 2013-11-13 19:41:05 +00:00
parent 9692f20a99
commit 26ac6881cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GNUmakefile
View File

@ -46,6 +46,7 @@ ifeq ($(release),1)
################ ################
# release build - fastest run-time, no gdb support # release build - fastest run-time, no gdb support
################ ################
CC_OPTIONS = -s -g -O3 -DNDEBUG CC_OPTIONS = -s -g -O3 -DNDEBUG
CXX_OPTIONS = -s -g -O3 -DNDEBUG CXX_OPTIONS = -s -g -O3 -DNDEBUG
LNK_OPTIONS = -pthread -O3 LNK_OPTIONS = -pthread -O3
@ -56,6 +57,7 @@ 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 -O3 -pg -DNDEBUG CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
LNK_OPTIONS = -pthread -ggdb -O3 -pg LNK_OPTIONS = -pthread -ggdb -O3 -pg
@ -66,6 +68,7 @@ ifeq ($(pedantic),1)
################ ################
# pedantic build - basically a debug build with lots of warnings # pedantic build - basically a debug build with lots of warnings
################ ################
CC_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long 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 CXX_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long
LNK_OPTIONS = -pthread -ggdb LNK_OPTIONS = -pthread -ggdb
@ -76,6 +79,7 @@ else
# debug build - fully traceable by gdb in C++ code, slowest # 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 # Since C code is used only for supporting libraries (zlib, lua), it is still O3-optimized
################ ################
CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3 CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3
CXX_OPTIONS = -s -ggdb -g -D_DEBUG CXX_OPTIONS = -s -ggdb -g -D_DEBUG
LNK_OPTIONS = -pthread -g -ggdb LNK_OPTIONS = -pthread -g -ggdb
@ -140,7 +144,6 @@ endif
################################################### ###################################################
# INCLUDE directories for MCServer # INCLUDE directories for MCServer
#
INCLUDE = -I.\ INCLUDE = -I.\
-Isource\ -Isource\
@ -162,9 +165,6 @@ INCLUDE = -I.\
################################################### ###################################################
# Build MCServer # Build MCServer
#
# 2012_11_08 _X: Removed: squirrel_3_0_1_stable
SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile expat '(' -name '*.cpp' -o -name '*.c' ')') SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile expat '(' -name '*.cpp' -o -name '*.c' ')')
SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES)) SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES))