author | mickeyl <mickeyl> | 2004-04-06 11:50:55 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-06 11:50:55 (UTC) |
commit | d3d2fbab3991b637f50217bbe966484f583fbb19 (patch) (unidiff) | |
tree | 3c41060ec050dae7df7261f44ca4507c8d965802 | |
parent | cbedf80c65fe86d0ca901a9f5f4519564ffdc90a (diff) | |
download | opie-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
-rw-r--r-- | Rules.make | 2 | ||||
-rw-r--r-- | config.in | 5 |
2 files changed, 7 insertions, 0 deletions
@@ -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 >> $@ |
71 | endif | 71 | endif |
72 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ | 72 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ |
73 | ifeq ($(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) >> $@ |
75 | endif | ||
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 |
@@ -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 | ||
143 | config OPIE_WE_VERSION_OVERRIDE | ||
144 | boolean "Override autodetection of wireless extension (WE) version | ||
145 | default n | ||
146 | |||
143 | config OPIE_WE_VERSION | 147 | config 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 |