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),)
         echo CONFIG -= release >> $@
 else
         echo CONFIG -= debug >> $@
         echo CONFIG += release >> $@
 endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
         echo CONFIG -= qt3 >> $@
 else
         echo CONFIG += qt3 >> $@
 endif
 ifneq ($(CONFIG_QUICK_LAUNCH),)
         echo contains\( CONFIG, quick-app \) \{ >> $@
         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
         @cat $(TOPDIR)/packages | \
                 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
 
 $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
         @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
         @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 ) >> $@
         @-rm -f dirs
 
 $(QTDIR)/stamp-headers :
         @-rm -f $(QTDIR)/stamp-headers*
         ( 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
   config TARGET_SIMPAD
     boolean "SIMpad"
 
   config TARGET_YOPY
     boolean "Yopy 3500/3700"  
 
 endchoice
 
 config OPTIMIZE
   boolean "Use optimizations"
   default "y" if ! TARGET_X86
 
 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)
   default "linux-g++" if TARGET_SIMPAD && X11
   default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
   default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   default "custom-ramses.h" if TARGET_RAMSES
   default "custom-ipaq.h" if TARGET_SIMPAD
   default "custom-yopy.h" if TARGET_YOPY
 
 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_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
   source core/qws/config.in
 endmenu
 
 comment ""
 
 menu "Applets"
   source core/applets/config.in
   source noncore/applets/config.in
 endmenu
 
 menu "Apps"
   source core/apps/config.in