2 files changed, 17 insertions, 0 deletions

diff --git a/Makefile.test b/Makefile.test
index 11fec40..209eef3 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -93,8 +93,14 @@ endif
 -include $(TOPDIR)/..config.cmd
 
 export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 
+ifdef CONFIG_OPTIMIZATIONS
+export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
+export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
+$(warning CFLAGS_RELEASE is $(CFLAGS_RELEASE))
+endif
+
 all clean: $(subdir-y)
 
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
         $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
diff --git a/config.in.in b/config.in.in
index 7af1f17..679292f 100644
--- a/config.in.in
+++ b/config.in.in
@@ -33,8 +33,12 @@ choice
     boolean "Ipaq"
 
 endchoice
 
+config OPTIMIZE
+  boolean "Use optimizations"
+  default "y" if ! TARGET_X86
+
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
   default "linux-g++" if TARGET_X86 && X11
@@ -48,8 +52,15 @@ config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   
+
+config OPTIMIZATIONS
+  string "Optimization flags"
+  depends OPTIMIZE
+  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
+  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
+
 #config CROSS
 #  string "Crosscompilation prefix"
 #  default "arm-linux-"
 #  help