1 files changed, 6 insertions, 9 deletions
diff --git a/make.defs b/make.defs
index 067c22b..17b06a8 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 #@warnings
 
 # 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 -fno-strict-aliasing