|
|
|
@@ -61,25 +61,27 @@ ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) |
61 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ |
61 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ |
62 | endif |
62 | endif |
63 | ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) |
63 | ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) |
64 | echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ |
64 | echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ |
65 | endif |
65 | endif |
66 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) |
66 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) |
67 | echo DEFINES += OPIE_NEW_MALLOC >> $@ |
67 | echo DEFINES += OPIE_NEW_MALLOC >> $@ |
68 | endif |
68 | endif |
69 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) |
69 | 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 |
77 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
79 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
78 | awk '{print \ |
80 | awk '{print \ |
79 | ".PHONY : " $$2 "\n" \ |
81 | ".PHONY : " $$2 "\n" \ |
80 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
82 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
81 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
83 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
82 | cat $(TOPDIR)/packages | grep -v '^#' | \ |
84 | cat $(TOPDIR)/packages | grep -v '^#' | \ |
83 | perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ |
85 | perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ |
84 | >> $(TOPDIR)/.depends |
86 | >> $(TOPDIR)/.depends |
85 | # interpackage dependency generation |
87 | # interpackage dependency generation |
|
|
diff --git a/config.in b/config.in index 0b01f78..7ad5e51 100644 --- a/ config.in+++ b/ config.in |
|
@@ -131,25 +131,30 @@ config OPIE_HIGH_RES_SMALL_PHY |
131 | default n |
131 | default n |
132 | |
132 | |
133 | config OPIE_NEW_ALLOC |
133 | config OPIE_NEW_ALLOC |
134 | boolean "Use malloc and free for the implementation" |
134 | boolean "Use malloc and free for the implementation" |
135 | default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP |
135 | default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP |
136 | default n |
136 | default n |
137 | |
137 | |
138 | config OPIE_NO_SOUND_PCM_READ_BITS |
138 | config OPIE_NO_SOUND_PCM_READ_BITS |
139 | boolean "There is not a pcm_read_bits io control" |
139 | boolean "There is not a pcm_read_bits io control" |
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 |
147 | |
152 | |
148 | endmenu |
153 | endmenu |
149 | |
154 | |
150 | menu "Base" |
155 | menu "Base" |
151 | choice |
156 | choice |
152 | prompt "Qpe Library Selection" |
157 | prompt "Qpe Library Selection" |
153 | default LIBQPE |
158 | default LIBQPE |
154 | source library/config.in |
159 | source library/config.in |
155 | source x11/config.in |
160 | source x11/config.in |
|