summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test6
-rw-r--r--config.in.in11
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
@@ -91,12 +91,18 @@ export include-config := 1
91endif 91endif
92 92
93-include $(TOPDIR)/..config.cmd 93-include $(TOPDIR)/..config.cmd
94 94
95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
96 96
97ifdef CONFIG_OPTIMIZATIONS
98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
100$(warning CFLAGS_RELEASE is $(CFLAGS_RELEASE))
101endif
102
97all clean: $(subdir-y) 103all clean: $(subdir-y)
98 104
99$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ 105$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
100 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ 106 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
101 $(TOPDIR)/library/custom.h 107 $(TOPDIR)/library/custom.h
102 108
diff --git a/config.in.in b/config.in.in
index 7af1f17..679292f 100644
--- a/config.in.in
+++ b/config.in.in
@@ -31,12 +31,16 @@ choice
31 31
32 config TARGET_IPAQ 32 config TARGET_IPAQ
33 boolean "Ipaq" 33 boolean "Ipaq"
34 34
35endchoice 35endchoice
36 36
37config OPTIMIZE
38 boolean "Use optimizations"
39 default "y" if ! TARGET_X86
40
37config SPECFILE 41config SPECFILE
38 string 42 string
39 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 43 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
40 default "linux-g++" if TARGET_X86 && X11 44 default "linux-g++" if TARGET_X86 && X11
41 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 45 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
42 default "linux-g++" if TARGET_SHARP && X11 46 default "linux-g++" if TARGET_SHARP && X11
@@ -46,12 +50,19 @@ config SPECFILE
46 50
47config CUSTOMFILE 51config CUSTOMFILE
48 string 52 string
49 default "custom-ipaq.h" if TARGET_IPAQ 53 default "custom-ipaq.h" if TARGET_IPAQ
50 default "custom-sharp.h" if TARGET_SHARP 54 default "custom-sharp.h" if TARGET_SHARP
51 55
56
57config OPTIMIZATIONS
58 string "Optimization flags"
59 depends OPTIMIZE
60 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
61 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
62
52#config CROSS 63#config CROSS
53# string "Crosscompilation prefix" 64# string "Crosscompilation prefix"
54# default "arm-linux-" 65# default "arm-linux-"
55# help 66# help
56# Crosscompilation prefix is the prefix which will be prepended 67# Crosscompilation prefix is the prefix which will be prepended
57# to all compilation commands. For example, a crosscompilation prefix 68# to all compilation commands. For example, a crosscompilation prefix