summaryrefslogtreecommitdiff
authorzecke <zecke>2003-11-30 13:12:55 (UTC)
committer zecke <zecke>2003-11-30 13:12:55 (UTC)
commit6804b865ea84e995e93e22582d0584b84810be38 (patch) (side-by-side diff)
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) (show 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
@@ -23,25 +23,46 @@ ifneq ($(CONFIG_QUICK_LAUNCH),)
echo CONFIG -= quick-app >> $@
echo CONFIG += quick-app-lib >> $@
echo \} >> $@
else
echo contains\( CONFIG, quick-app \) \{ >> $@
echo CONFIG -= quick-app >> $@
echo CONFIG += quick-app-bin >> $@
echo \} >> $@
endif
ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
echo CONFIG += no-override >> $@
endif
-
+ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
+ echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
+endif
+ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
+ echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
+endif
+ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
+ echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
+endif
+ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
+ echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
+endif
+ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
+ echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
+endif
+ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
+ echo DEFINES += OPIE_NEW_ALLOC >> $@
+endif
+ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
+ echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
+endif
+ echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
@echo Generating dependency information...
# add to subdir-y, and add descend rules
@cat $(TOPDIR)/packages | grep -v '^#' | \
awk '{print \
".PHONY : " $$2 "\n" \
"subdir-$$(" $$1 ") += " $$2 "\n\n"; \
print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
cat $(TOPDIR)/packages | grep -v '^#' | \
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"; }' \
>> $(TOPDIR)/.depends
# interpackage dependency generation
diff --git a/config.in b/config.in
index b3a60bb..6adf17e 100644
--- a/config.in
+++ b/config.in
@@ -39,27 +39,24 @@ config OPTIMIZE
config DEBUG
boolean "Enable debug builds"
default n
config RELEASE
bool
default y
depends !DEBUG
config QUICK_LAUNCH
boolean "Enable Quick Launch"
default n
-config OPIE_NO_OVERRIDE_QT
- boolean "Build Opie against an unpatched version of Qt"
- default n
config SPECFILE
string
default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
default "linux-g++" if TARGET_X86 && X11
default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
default "linux-g++" if TARGET_SHARP && X11
default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
default "linux-g++" if TARGET_IPAQ && X11
default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
default "linux-g++" if TARGET_RAMSES && X11
default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
@@ -81,24 +78,71 @@ config OPTIMIZATIONS
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_YOPY
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
config EXPERIMENTAL
bool "Prompt for development and/or incomplete items"
default y
endmenu
+menu "Opie Compile Configs"
+config OPIE_NO_OVERRIDE_QT
+ boolean "Build Opie against an unpatched version of Qt"
+ default n
+
+
+config OPIE_NO_BUILTIN_SHUTDOWN
+ boolean "Disable the built in shutdown application"
+ default n
+
+config OPIE_NO_BUILTIN_CALIBRATE
+ boolean "Disable the built in calibrate application"
+ default y if TARGET_YOPY
+ default n
+
+config OPIE_SOUND_FRAGMENT_SHIFT
+ string "The sound fragment used in Opie Player I"
+ default "14" if TARGET_IPAQ
+ default "16" if (!TARGET_IPAQ)
+
+config USE_REALTIME_AUDIO_THREAD
+ boolean "Use a realtime thread in Opie Player I"
+ default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
+ default n
+
+config QT_QWS_ALLOW_OVERCLOCK
+ boolean "Allow the user to overclock the device"
+ depends TARGET_RAMSES
+ default n
+
+config OPIE_HIGH_RES_SMALL_PHY
+ boolean "Resolution is bigger than physical scrren"
+ default y if TARGET_C700
+ default n
+
+config OPIE_NEW_ALLOC
+ boolean "Use malloc and free for the implementation"
+ default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
+ default n
+
+config OPIE_NO_SOUND_PCM_READ_BITS
+ boolean "there is not a pcm_read_bits io control"
+ default y if TARGET_SHARP
+ default n
+
+endmenu
+
menu "Base"
choice
prompt "Qpe Library Selection"
default LIBQPE
source library/config.in
source x11/config.in
endchoice
source libopie/config.in
source core/opie-login/config.in
source core/opiealarm/config.in
source core/tools/quicklauncher/config.in
source core/launcher/config.in