From 9692f20a99e32a7859e4e8522393d116f11517ba Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Wed, 13 Nov 2013 19:36:04 +0000 Subject: Fixed link error with clang on x86_64. --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 338470592..e056a61ec 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -103,7 +103,7 @@ endif UNAME := $(shell uname -s) ifeq ($(UNAME),Linux) - LNK_LIBS = -lstdc++ -ldl + LNK_LIBS = -lstdc++ -ldl -lm else LNK_LIBS = -lstdc++ -lltdl endif -- cgit v1.2.3 From 26ac6881cd5985eefe08fc7307f4d09442b68fd1 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Wed, 13 Nov 2013 19:41:05 +0000 Subject: Fixed some of the comments in the makefile. --- GNUmakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index e056a61ec..de1da1455 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -46,6 +46,7 @@ ifeq ($(release),1) ################ # release build - fastest run-time, no gdb support ################ + CC_OPTIONS = -s -g -O3 -DNDEBUG CXX_OPTIONS = -s -g -O3 -DNDEBUG LNK_OPTIONS = -pthread -O3 @@ -56,6 +57,7 @@ ifeq ($(profile),1) ################ # profile build - a release build with symbols and profiling engine built in ################ + CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG LNK_OPTIONS = -pthread -ggdb -O3 -pg @@ -66,6 +68,7 @@ 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 @@ -76,6 +79,7 @@ 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 @@ -140,7 +144,6 @@ endif ################################################### # INCLUDE directories for MCServer -# INCLUDE = -I.\ -Isource\ @@ -162,9 +165,6 @@ INCLUDE = -I.\ ################################################### # 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 := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES)) -- cgit v1.2.3 From cd8894fca680eb315110ad481bf6d54090792a99 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Wed, 13 Nov 2013 19:53:39 +0000 Subject: Got rid of warnings caused by the -s option on Clang, and it doesn't seem to do anything anyway. --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index de1da1455..e40748bef 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -47,8 +47,8 @@ ifeq ($(release),1) # release build - fastest run-time, no gdb support ################ -CC_OPTIONS = -s -g -O3 -DNDEBUG -CXX_OPTIONS = -s -g -O3 -DNDEBUG +CC_OPTIONS = -g -O3 -DNDEBUG +CXX_OPTIONS = -g -O3 -DNDEBUG LNK_OPTIONS = -pthread -O3 BUILDDIR = build/release/ -- cgit v1.2.3 From eca23ed0b3558d5c6bca960a599924b888fd2468 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sat, 16 Nov 2013 17:49:14 +0000 Subject: Always warn about everything! This should help me in my efforts. --- GNUmakefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index e40748bef..d8afc0525 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -88,6 +88,10 @@ endif endif endif +################################################## +# Always be warning. + +CXX_OPTIONS += -Wall ################################################### # Fix Crypto++ warnings in clang -- cgit v1.2.3