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
@@ -29,13 +29,34 @@ else
         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" \
diff --git a/config.in b/config.in
index b3a60bb..6adf17e 100644
--- a/config.in
+++ b/config.in
@@ -45,15 +45,12 @@ config RELEASE
   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)
@@ -87,12 +84,59 @@ config OPTIMIZATIONS
 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