summaryrefslogtreecommitdiff
path: root/make.defs
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-08-30 16:16:25 -0700
committerBen Longbons <b.r.longbons@gmail.com>2012-08-30 17:03:31 -0700
commit41974ae5265fbc23a06f276f9e008d5dad020e0b (patch)
tree9d595215172e87e2d83b74f7bf3430b3040e780e /make.defs
parent21742909143df9159b2401c3e2a39cc0b2bad620 (diff)
downloadtmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.tar.gz
tmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.tar.bz2
tmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.tar.xz
tmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.zip
Rename files for C++ conversion. Does not compile.
After updating, you can remove these files, as shown in 'git status': Untracked files: (use "git add <file>..." to include in what will be committed) src/map/magic-interpreter-lexer.c src/map/magic-interpreter-parser.c src/map/magic-interpreter-parser.h
Diffstat (limited to 'make.defs')
-rw-r--r--make.defs15
1 files changed, 6 insertions, 9 deletions
diff --git a/make.defs b/make.defs
index 067c22b..9328688 100644
--- a/make.defs
+++ b/make.defs
@@ -1,16 +1,13 @@
# defaults
-CC = gcc
+CXX = g++
LEX = flex
BISON = bison
-CFLAGS = -pipe -g -O2
+CXXFLAGS = -pipe -g -O2
# works on both x86 and x86_64
-override CC += -m32 -std=gnu99
+override CXX += -m32 -std=c++0x
+# for linking
+override CC = ${CXX}
-# TODO check if this is actually needed - I don't think it should be
-ifeq ($(findstring CYGWIN,$(shell uname)), CYGWIN)
- override CFLAGS += -DFD_SETSIZE=4096 -DCYGWIN
-else
- override CFLAGS += -fstack-protector
-endif
+override CXXFLAGS += -fstack-protector