+++ /dev/null
---- Makefile.orig
-+++ Makefile
-@@ -81,8 +81,6 @@
- ifeq ($(findstring $(OSTYPE), amiga haiku mac),)\r
- CFLAGS += -minline-all-stringops\r
- endif\r
--else\r
-- CFLAGS += -O\r
- endif\r
- \r
- ifdef DEBUG\r
-@@ -101,6 +99,7 @@
- endif\r
- else\r
- CFLAGS += -DNDEBUG\r
-+ CXXFLAGS += -DNDEBUG\r
- endif\r
- \r
- ifneq ($(PROFILE),)\r
-@@ -114,6 +113,7 @@
- ifneq ($(MULTI_THREAD),)\r
- ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)\r
- CFLAGS += -DMULTI_THREAD\r
-+ CXXFLAGS += -DMULTI_THREAD\r
- ifeq ($(OSTYPE),mingw)\r
- #use lpthreadGC2d for debug alternatively\r
- LDFLAGS += -lpthreadGC2\r
-@@ -132,11 +132,13 @@
- endif\r
- ifneq ($(REV),)\r
- CFLAGS += -DREVISION="$(REV)"\r
-+ CXXFLAGS += -DREVISION="$(REV)"\r
- endif\r
- endif\r
- endif\r
- \r
- CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)\r
-+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)\r
- CCFLAGS += -Wstrict-prototypes\r
- \r
- \r
-@@ -492,6 +494,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS)\r
- endif\r
- \r
-@@ -523,6 +526,7 @@
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS)\r
- endif\r
- \r
-@@ -538,6 +542,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS) -lSDL_mixer\r
- endif\r
- \r
-@@ -564,6 +569,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS) -lglew32\r
- ifeq ($(OSTYPE),mingw)\r
- LIBS += -lopengl32\r
-@@ -579,6 +585,7 @@
- endif\r
- \r
- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)\r
-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)\r
- \r
- ifneq ($(findstring $(OSTYPE), cygwin mingw),)\r
- SOURCES += simres.rc\r
-@@ -586,7 +593,6 @@
- endif\r
- \r
- CCFLAGS += $(CFLAGS)\r
--CXXFLAGS += $(CFLAGS)\r
- \r
- BUILDDIR ?= build/$(CFG)\r
- PROGDIR ?= $(BUILDDIR)\r
+++ /dev/null
---- a/Makefile
-+++ b/Makefile
-@@ -81,8 +81,6 @@
- ifeq ($(findstring $(OSTYPE), amiga haiku mac),)\r
- CFLAGS += -minline-all-stringops\r
- endif\r
--else\r
-- CFLAGS += -O\r
- endif\r
- \r
- ifdef DEBUG\r
-@@ -101,6 +99,7 @@
- endif\r
- else\r
- CFLAGS += -DNDEBUG\r
-+ CXXFLAGS += -DNDEBUG\r
- endif\r
- \r
- ifneq ($(PROFILE),)\r
-@@ -114,6 +113,7 @@
- ifneq ($(MULTI_THREAD),)\r
- ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)\r
- CFLAGS += -DMULTI_THREAD\r
-+ CXXFLAGS += -DMULTI_THREAD\r
- ifeq ($(OSTYPE),mingw)\r
- #use lpthreadGC2d for debug alternatively\r
- LDFLAGS += -lpthreadGC2\r
-@@ -132,11 +132,13 @@
- endif\r
- ifneq ($(REV),)\r
- CFLAGS += -DREVISION="$(REV)"\r
-+ CXXFLAGS += -DREVISION="$(REV)"\r
- endif\r
- endif\r
- endif\r
- \r
- CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)\r
-+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)\r
- CCFLAGS += -Wstrict-prototypes\r
- \r
- \r
-@@ -492,6 +494,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS)\r
- endif\r
- \r
-@@ -523,6 +526,7 @@
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS)\r
- endif\r
- \r
-@@ -538,6 +542,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS) -lSDL_mixer\r
- endif\r
- \r
-@@ -564,6 +569,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
- endif\r
- CFLAGS += $(SDL_CFLAGS)\r
-+ CXXFLAGS += $(SDL_CFLAGS)\r
- LIBS += $(SDL_LDFLAGS) -lglew32\r
- ifeq ($(OSTYPE),mingw)\r
- LIBS += -lopengl32\r
-@@ -579,6 +585,7 @@
- endif\r
- \r
- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)\r
-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)\r
- \r
- ifneq ($(findstring $(OSTYPE), cygwin mingw),)\r
- SOURCES += simres.rc\r
-@@ -586,7 +593,6 @@
- endif\r
- \r
- CCFLAGS += $(CFLAGS)\r
--CXXFLAGS += $(CFLAGS)\r
- \r
- BUILDDIR ?= build/$(CFG)\r
- PROGDIR ?= $(BUILDDIR)\r