From 41974ae5265fbc23a06f276f9e008d5dad020e0b Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 30 Aug 2012 16:16:25 -0700
Subject: 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
---
 make.defs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'make.defs')

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
 
-- 
cgit v1.2.3-70-g09d2