disabling exceptions

diff --git a/configure b/configure
index ece9ea2..3dcab9f 100755 (executable)
--- a/configure
+++ b/configure
@@ -16,7 +16,7 @@ echo CONF_GUI=0 >> config.mk
 echo CONF_XSP=0 >> config.mk
 echo ASFLAGS="" >> config.mk
 echo CFLAGS="-Wall -g -O2" >> config.mk
-echo CXXFLAGS="-Wall -g -O2" >> config.mk
+echo CXXFLAGS="-Wall -g -O2 -fno-exceptions -fno-rtti" >> config.mk
 echo LDFLAGS="-Wl,-z,defs" >> config.mk
 
 make clean > /dev/null

diff --git a/debian/rules b/debian/rules
index 5d3025f..9a6d3b6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,11 +22,12 @@ MAEMO_VERSION := $(shell cut -d"." -f1 /etc/maemo_version)
 GAME_VERSION := $(shell head -n 1 debian/changelog | sed 's/[^0-9.-]//g')
 
 # Default CFLAGS
-CFLAGS = -Wall -g -DMAEMO -DMAEMO_VERSION=$(MAEMO_VERSION)
+CFLAGS := -Wall -g -DMAEMO -DMAEMO_VERSION=$(MAEMO_VERSION)
+CXXFLAGS := -Wall -g -DMAEMO -DMAEMO_VERSION=$(MAEMO_VERSION)
 GUI_CFLAGS := -std=c99 -fPIC -shared $(CFLAGS)
-LDFLAGS = -Wl,-z,defs
+LDFLAGS := -Wl,-z,defs
 GUI_LDFLAGS := -export-dynamic -avoid-version -module -shared $(LDFLAGS)
-ASFLAGS = -g
+ASFLAGS := -g
 
 M4=m4
 M4DEFS=-DMAEMO_MAJOR=$(MAEMO_VERSION)
@@ -34,8 +35,11 @@ M4DEFS=-DMAEMO_MAJOR=$(MAEMO_VERSION)
 # Architecture specific CFLAGS
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
+       CXXFLAGS += -O0
+       GUI_CFLAGS += -O0
 else ifneq (,$(findstring armel,$(ARCH)))
        CFLAGS += -O2 -ffast-math
+       CXXFLAGS += -O2 -ffast-math -fno-exceptions -fno-rtti
        GUI_CFLAGS += -Os
        ifneq (,$(findstring vfp,$(DEB_BUILD_OPTIONS)))
                CFLAGS += -march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp
@@ -47,6 +51,7 @@ else ifneq (,$(findstring armel,$(ARCH)))
        endif
 else ifneq (,$(findstring i386,$(ARCH)))
        CFLAGS += -O2 -ffast-math
+       CXXFLAGS += -O2 -ffast-math -fno-exceptions -fno-rtti
        GUI_CFLAGS += -O2
 else
        # Don't support anything else
@@ -73,7 +78,7 @@ else
 endif
        echo ASFLAGS="$(ASFLAGS)" >> config.mk
        echo CFLAGS="$(CFLAGS)" >> config.mk
-       echo CXXFLAGS="$(CFLAGS)" >> config.mk
+       echo CXXFLAGS="$(CXXFLAGS)" >> config.mk
        echo LDFLAGS="$(LDFLAGS)" >> config.mk
        
        echo CONF_NLS=1 > gui/config.mk