summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-06 11:50:55 (UTC)
committer mickeyl <mickeyl>2004-04-06 11:50:55 (UTC)
commitd3d2fbab3991b637f50217bbe966484f583fbb19 (patch) (unidiff)
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) (ignore 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
@@ -70,7 +70,9 @@ ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
70 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 70 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
71endif 71endif
72 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 72 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
73ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
73 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ 74 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
75endif
74$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 76$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
75 @echo Generating dependency information... 77 @echo Generating dependency information...
76# add to subdir-y, and add descend rules 78# add to subdir-y, and add descend rules
diff --git a/config.in b/config.in
index 0b01f78..7ad5e51 100644
--- a/config.in
+++ b/config.in
@@ -140,7 +140,12 @@ config OPIE_NO_SOUND_PCM_READ_BITS
140 default y if TARGET_SHARP 140 default y if TARGET_SHARP
141 default n 141 default n
142 142
143config OPIE_WE_VERSION_OVERRIDE
144 boolean "Override autodetection of wireless extension (WE) version
145 default n
146
143config OPIE_WE_VERSION 147config OPIE_WE_VERSION
148 depends OPIE_WE_VERSION_OVERRIDE
144 string "The wireless extension (WE) version to build against" 149 string "The wireless extension (WE) version to build against"
145 default "15" if ! TARGET_X86 150 default "15" if ! TARGET_X86
146 default "16" if TARGET_X86 151 default "16" if TARGET_X86