summaryrefslogtreecommitdiff
authorzecke <zecke>2003-11-30 13:12:55 (UTC)
committer zecke <zecke>2003-11-30 13:12:55 (UTC)
commit6804b865ea84e995e93e22582d0584b84810be38 (patch) (unidiff)
treee43bdd7d9104bcbbd2173e8836e0bf7180d80060
parent667d6cc5ca0abb0f4b8b481ce053f92412babd87 (diff)
downloadopie-6804b865ea84e995e93e22582d0584b84810be38.zip
opie-6804b865ea84e995e93e22582d0584b84810be38.tar.gz
opie-6804b865ea84e995e93e22582d0584b84810be38.tar.bz2
Obsolete many of the custom-platform.h files. Values can be controled
by make menuconfig now. The default depends match the old custom-platform files. Todo remove content from the platform files
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make23
-rw-r--r--config.in50
2 files changed, 69 insertions, 4 deletions
diff --git a/Rules.make b/Rules.make
index 86543bb..5cdbb00 100644
--- a/Rules.make
+++ b/Rules.make
@@ -11,49 +11,70 @@ ifneq ($(CONFIG_DEBUG),)
11 echo CONFIG -= release >> $@ 11 echo CONFIG -= release >> $@
12else 12else
13 echo CONFIG -= debug >> $@ 13 echo CONFIG -= debug >> $@
14 echo CONFIG += release >> $@ 14 echo CONFIG += release >> $@
15endif 15endif
16ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 16ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
17 echo CONFIG -= qt3 >> $@ 17 echo CONFIG -= qt3 >> $@
18else 18else
19 echo CONFIG += qt3 >> $@ 19 echo CONFIG += qt3 >> $@
20endif 20endif
21ifneq ($(CONFIG_QUICK_LAUNCH),) 21ifneq ($(CONFIG_QUICK_LAUNCH),)
22 echo contains\( CONFIG, quick-app \) \{ >> $@ 22 echo contains\( CONFIG, quick-app \) \{ >> $@
23 echo CONFIG -= quick-app >> $@ 23 echo CONFIG -= quick-app >> $@
24 echo CONFIG += quick-app-lib >> $@ 24 echo CONFIG += quick-app-lib >> $@
25 echo \} >> $@ 25 echo \} >> $@
26else 26else
27 echo contains\( CONFIG, quick-app \) \{ >> $@ 27 echo contains\( CONFIG, quick-app \) \{ >> $@
28 echo CONFIG -= quick-app >> $@ 28 echo CONFIG -= quick-app >> $@
29 echo CONFIG += quick-app-bin >> $@ 29 echo CONFIG += quick-app-bin >> $@
30 echo \} >> $@ 30 echo \} >> $@
31 endif 31 endif
32ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 32ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
33 echo CONFIG += no-override >> $@ 33 echo CONFIG += no-override >> $@
34endif 34endif
35 35ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
36 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
37endif
38ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
39 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
40endif
41ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
42 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
43endif
44ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
45 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
46endif
47ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
48 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
49endif
50ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
51 echo DEFINES += OPIE_NEW_ALLOC >> $@
52endif
53ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
54 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
55endif
56 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
36$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 57$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
37 @echo Generating dependency information... 58 @echo Generating dependency information...
38# add to subdir-y, and add descend rules 59# add to subdir-y, and add descend rules
39 @cat $(TOPDIR)/packages | grep -v '^#' | \ 60 @cat $(TOPDIR)/packages | grep -v '^#' | \
40 awk '{print \ 61 awk '{print \
41 ".PHONY : " $$2 "\n" \ 62 ".PHONY : " $$2 "\n" \
42 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 63 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
43 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 64 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
44 cat $(TOPDIR)/packages | grep -v '^#' | \ 65 cat $(TOPDIR)/packages | grep -v '^#' | \
45 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 66 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
46 >> $(TOPDIR)/.depends 67 >> $(TOPDIR)/.depends
47# interpackage dependency generation 68# interpackage dependency generation
48 @cat $(TOPDIR)/packages | \ 69 @cat $(TOPDIR)/packages | \
49 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 70 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
50 71
51$(TOPDIR)/.depends.cfgs: 72$(TOPDIR)/.depends.cfgs:
52# config.in interdependencies 73# config.in interdependencies
53 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 74 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
54 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 75 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
55 @-rm -f dirs 76 @-rm -f dirs
56 77
57$(QTDIR)/stamp-headers : 78$(QTDIR)/stamp-headers :
58 @-rm -f $(QTDIR)/stamp-headers* 79 @-rm -f $(QTDIR)/stamp-headers*
59 ( cd $(QTDIR)/include; \ 80 ( cd $(QTDIR)/include; \
diff --git a/config.in b/config.in
index b3a60bb..6adf17e 100644
--- a/config.in
+++ b/config.in
@@ -27,90 +27,134 @@ choice
27 config TARGET_SIMPAD 27 config TARGET_SIMPAD
28 boolean "SIMpad" 28 boolean "SIMpad"
29 29
30 config TARGET_YOPY 30 config TARGET_YOPY
31 boolean "Yopy 3500/3700" 31 boolean "Yopy 3500/3700"
32 32
33endchoice 33endchoice
34 34
35config OPTIMIZE 35config OPTIMIZE
36 boolean "Use optimizations" 36 boolean "Use optimizations"
37 default "y" if ! TARGET_X86 37 default "y" if ! TARGET_X86
38 38
39config DEBUG 39config DEBUG
40 boolean "Enable debug builds" 40 boolean "Enable debug builds"
41 default n 41 default n
42config RELEASE 42config RELEASE
43 bool 43 bool
44 default y 44 default y
45 depends !DEBUG 45 depends !DEBUG
46 46
47config QUICK_LAUNCH 47config QUICK_LAUNCH
48 boolean "Enable Quick Launch" 48 boolean "Enable Quick Launch"
49 default n 49 default n
50 50
51config OPIE_NO_OVERRIDE_QT
52 boolean "Build Opie against an unpatched version of Qt"
53 default n
54 51
55config SPECFILE 52config SPECFILE
56 string 53 string
57 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 54 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
58 default "linux-g++" if TARGET_X86 && X11 55 default "linux-g++" if TARGET_X86 && X11
59 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 56 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
60 default "linux-g++" if TARGET_SHARP && X11 57 default "linux-g++" if TARGET_SHARP && X11
61 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) 58 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
62 default "linux-g++" if TARGET_IPAQ && X11 59 default "linux-g++" if TARGET_IPAQ && X11
63 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) 60 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
64 default "linux-g++" if TARGET_RAMSES && X11 61 default "linux-g++" if TARGET_RAMSES && X11
65 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) 62 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
66 default "linux-g++" if TARGET_SIMPAD && X11 63 default "linux-g++" if TARGET_SIMPAD && X11
67 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) 64 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
68 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) 65 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
69 66
70config CUSTOMFILE 67config CUSTOMFILE
71 string 68 string
72 default "custom-ipaq.h" if TARGET_IPAQ 69 default "custom-ipaq.h" if TARGET_IPAQ
73 default "custom-sharp.h" if TARGET_SHARP 70 default "custom-sharp.h" if TARGET_SHARP
74 default "custom-ramses.h" if TARGET_RAMSES 71 default "custom-ramses.h" if TARGET_RAMSES
75 default "custom-ipaq.h" if TARGET_SIMPAD 72 default "custom-ipaq.h" if TARGET_SIMPAD
76 default "custom-yopy.h" if TARGET_YOPY 73 default "custom-yopy.h" if TARGET_YOPY
77 74
78config OPTIMIZATIONS 75config OPTIMIZATIONS
79 string "Optimization flags" 76 string "Optimization flags"
80 depends OPTIMIZE 77 depends OPTIMIZE
81 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ 78 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
82 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY 79 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
83 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP 80 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
84 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES 81 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
85 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD 82 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
86 83
87config EXPERIMENTAL 84config EXPERIMENTAL
88 bool "Prompt for development and/or incomplete items" 85 bool "Prompt for development and/or incomplete items"
89 default y 86 default y
90 87
91endmenu 88endmenu
92 89
90menu "Opie Compile Configs"
91config OPIE_NO_OVERRIDE_QT
92 boolean "Build Opie against an unpatched version of Qt"
93 default n
94
95
96config OPIE_NO_BUILTIN_SHUTDOWN
97 boolean "Disable the built in shutdown application"
98 default n
99
100config OPIE_NO_BUILTIN_CALIBRATE
101 boolean "Disable the built in calibrate application"
102 default y if TARGET_YOPY
103 default n
104
105config OPIE_SOUND_FRAGMENT_SHIFT
106 string "The sound fragment used in Opie Player I"
107 default "14" if TARGET_IPAQ
108 default "16" if (!TARGET_IPAQ)
109
110config USE_REALTIME_AUDIO_THREAD
111 boolean "Use a realtime thread in Opie Player I"
112 default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
113 default n
114
115config QT_QWS_ALLOW_OVERCLOCK
116 boolean "Allow the user to overclock the device"
117 depends TARGET_RAMSES
118 default n
119
120config OPIE_HIGH_RES_SMALL_PHY
121 boolean "Resolution is bigger than physical scrren"
122 default y if TARGET_C700
123 default n
124
125config OPIE_NEW_ALLOC
126 boolean "Use malloc and free for the implementation"
127 default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
128 default n
129
130config OPIE_NO_SOUND_PCM_READ_BITS
131 boolean "there is not a pcm_read_bits io control"
132 default y if TARGET_SHARP
133 default n
134
135endmenu
136
93menu "Base" 137menu "Base"
94 choice 138 choice
95 prompt "Qpe Library Selection" 139 prompt "Qpe Library Selection"
96 default LIBQPE 140 default LIBQPE
97 source library/config.in 141 source library/config.in
98 source x11/config.in 142 source x11/config.in
99 endchoice 143 endchoice
100 source libopie/config.in 144 source libopie/config.in
101 source core/opie-login/config.in 145 source core/opie-login/config.in
102 source core/opiealarm/config.in 146 source core/opiealarm/config.in
103 source core/tools/quicklauncher/config.in 147 source core/tools/quicklauncher/config.in
104 source core/launcher/config.in 148 source core/launcher/config.in
105 source core/qws/config.in 149 source core/qws/config.in
106endmenu 150endmenu
107 151
108comment "" 152comment ""
109 153
110menu "Applets" 154menu "Applets"
111 source core/applets/config.in 155 source core/applets/config.in
112 source noncore/applets/config.in 156 source noncore/applets/config.in
113endmenu 157endmenu
114 158
115menu "Apps" 159menu "Apps"
116 source core/apps/config.in 160 source core/apps/config.in