summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-06 11:50:55 (UTC)
committer mickeyl <mickeyl>2004-04-06 11:50:55 (UTC)
commitd3d2fbab3991b637f50217bbe966484f583fbb19 (patch) (side-by-side diff)
tree3c41060ec050dae7df7261f44ca4507c8d965802
parentcbedf80c65fe86d0ca901a9f5f4519564ffdc90a (diff)
downloadopie-d3d2fbab3991b637f50217bbe966484f583fbb19.zip
opie-d3d2fbab3991b637f50217bbe966484f583fbb19.tar.gz
opie-d3d2fbab3991b637f50217bbe966484f583fbb19.tar.bz2
specifying the wireless extension version is now optional thanks
to libopienet2 gathering the WE version automatically you can still override it if needed
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make2
-rw-r--r--config.in5
2 files changed, 7 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index 3f494ce..94a79e7 100644
--- a/Rules.make
+++ b/Rules.make
@@ -65,17 +65,19 @@ 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) >> $@
+ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
+endif
$(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 0b01f78..7ad5e51 100644
--- a/config.in
+++ b/config.in
@@ -135,17 +135,22 @@ config OPIE_NEW_ALLOC
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
+config OPIE_WE_VERSION_OVERRIDE
+ boolean "Override autodetection of wireless extension (WE) version
+ default n
+
config OPIE_WE_VERSION
+ depends OPIE_WE_VERSION_OVERRIDE
string "The wireless extension (WE) version to build against"
default "15" if ! TARGET_X86
default "16" if TARGET_X86
endmenu
menu "Base"
choice