summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make1
-rw-r--r--config.in12
2 files changed, 9 insertions, 4 deletions
diff --git a/Rules.make b/Rules.make
index 84b7dab..bc00d7e 100644
--- a/Rules.make
+++ b/Rules.make
@@ -50,16 +50,17 @@ ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
endif
ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
echo DEFINES += OPIE_NEW_MALLOC >> $@
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) >> $@
+ echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
$(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
diff --git a/config.in b/config.in
index 1ac9a66..96cd28f 100644
--- a/config.in
+++ b/config.in
@@ -86,22 +86,21 @@ config OPTIMIZATIONS
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"
+menu "Configuration"
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
@@ -117,30 +116,35 @@ config USE_REALTIME_AUDIO_THREAD
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"
+ boolean "Resolution is bigger than physical screen"
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"
+ boolean "There is not a pcm_read_bits io control"
default y if TARGET_SHARP
default n
+config OPIE_WE_VERSION
+ string "The wireless extension (WE) version to build against"
+ default "15" if ! TARGET_X86
+ default "16" if TAGET_X86
+
endmenu
menu "Base"
choice
prompt "Qpe Library Selection"
default LIBQPE
source library/config.in
source x11/config.in