|
diff --git a/configure b/configure index 9de0276..0241adf 100755 --- a/ configure+++ b/ configure |
|
@@ -144,148 +144,148 @@ sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library |
144 | mv library/library.pro-v library/library.pro |
144 | mv library/library.pro-v library/library.pro |
145 | |
145 | |
146 | if [ "$QT3" = yes ] |
146 | if [ "$QT3" = yes ] |
147 | then |
147 | then |
148 | VCONFIG="CONFIG+=qt3" |
148 | VCONFIG="CONFIG+=qt3" |
149 | else |
149 | else |
150 | VCONFIG="CONFIG+=qt2" |
150 | VCONFIG="CONFIG+=qt2" |
151 | fi |
151 | fi |
152 | |
152 | |
153 | if [ -f $TMAKEPATH/tmake.conf ] |
153 | if [ -f $TMAKEPATH/tmake.conf ] |
154 | then |
154 | then |
155 | # You have tmake. We'll regenerate the file for you... |
155 | # You have tmake. We'll regenerate the file for you... |
156 | echo "Makefiles will be regenerated." |
156 | echo "Makefiles will be regenerated." |
157 | fi |
157 | fi |
158 | |
158 | |
159 | H=`pwd` |
159 | H=`pwd` |
160 | if [ -z "$TOMAKE" ] |
160 | if [ -z "$TOMAKE" ] |
161 | then |
161 | then |
162 | TOMAKE=`make showcomponents` |
162 | TOMAKE=`make showcomponents` |
163 | fi |
163 | fi |
164 | |
164 | |
165 | for a in $TOMAKE ; do |
165 | for a in $TOMAKE ; do |
166 | N=$a/Makefile |
166 | N=$a/Makefile |
167 | M=$a/Makefile.in |
167 | M=$a/Makefile.in |
168 | O=$a/Makefile.add |
168 | O=$a/Makefile.add |
169 | f=`basename $a` |
169 | f=`basename $a` |
170 | |
170 | |
171 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
171 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
172 | then |
172 | then |
173 | ( cd $a; |
173 | ( cd $a; |
174 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
174 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
175 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
175 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
176 | -t $H/qt/tmake/propagate.t $f.pro | |
176 | -t $H/qt/tmake/propagate.t $f.pro | |
177 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
177 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
178 | ) |
178 | ) |
179 | echo -n "." |
179 | echo -n "." |
180 | #echo Building $N.. |
180 | #echo Building $N.. |
181 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
181 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
182 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
182 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
183 | if [ -n "$translation" -a -n "$appname" ] |
183 | if [ -n "$translation" -a -n "$appname" ] |
184 | then |
184 | then |
185 | if [ $appname != $translation ] |
185 | if [ $appname != $translation ] |
186 | then |
186 | then |
187 | echo |
187 | echo |
188 | echo "Warning: translation and appname disagree in $a/$f.pro" |
188 | echo "Warning: translation and appname disagree in $a/$f.pro" |
189 | fi |
189 | fi |
190 | fi |
190 | fi |
191 | |
191 | |
192 | fi |
192 | fi |
193 | |
193 | |
194 | cat > $N <<EOF |
194 | cat > $N <<EOF |
195 | ############################################################################# |
195 | ############################################################################# |
196 | # Automatically generated from $M |
196 | # Automatically generated from $M |
197 | # Build options from $1 |
197 | # Build options from $1 |
198 | ############################################################################# |
198 | ############################################################################# |
199 | |
199 | |
200 | EOF |
200 | EOF |
201 | |
201 | |
202 | SED= |
202 | SED= |
203 | PLATFORM_CFLAGS= |
203 | PLATFORM_CFLAGS= |
204 | |
204 | |
205 | if [ "$f" = "embeddedkonsole" ] |
205 | if [ "$f" = "embeddedkonsole" ] |
206 | then |
206 | then |
207 | case $PLATFORM in |
207 | case $PLATFORM in |
208 | *x86*|*generic*|*ipaq*) |
208 | *x86*|*generic*|*ipaq*|*sharp*) |
209 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
209 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
210 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
210 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
211 | ;; *) |
211 | ;; *) |
212 | SED= |
212 | SED= |
213 | esac |
213 | esac |
214 | elif [ "$f" = "libmpeg3" ] |
214 | elif [ "$f" = "libmpeg3" ] |
215 | then |
215 | then |
216 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library |
216 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library |
217 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) |
217 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) |
218 | SED='s/\$(CC)/\$(CXX)/;' |
218 | SED='s/\$(CC)/\$(CXX)/;' |
219 | case $PLATFORM |
219 | case $PLATFORM |
220 | in |
220 | in |
221 | # For x86 turn on using floating point, compile mmx and css code |
221 | # For x86 turn on using floating point, compile mmx and css code |
222 | *x86*) |
222 | *x86*) |
223 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" |
223 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" |
224 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
224 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
225 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
225 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
226 | # For generic turn on using floating point |
226 | # For generic turn on using floating point |
227 | ;; *generic*) |
227 | ;; *generic*) |
228 | PLATFORM_CFLAGS="" |
228 | PLATFORM_CFLAGS="" |
229 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
229 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
230 | ;; *ipaq*) |
230 | ;; *ipaq*|*sharp*) |
231 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
231 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
232 | ;; *) |
232 | ;; *) |
233 | # For 'other platforms', turn off optimizations and use fixed point |
233 | # For 'other platforms', turn off optimizations and use fixed point |
234 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
234 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
235 | esac |
235 | esac |
236 | elif [ "$f" = "libmad" ] |
236 | elif [ "$f" = "libmad" ] |
237 | then |
237 | then |
238 | # Patch our Makefile.in file with the platform specifics for the libmad library |
238 | # Patch our Makefile.in file with the platform specifics for the libmad library |
239 | case $PLATFORM |
239 | case $PLATFORM |
240 | in |
240 | in |
241 | # For x86 use intel optimizations |
241 | # For x86 use intel optimizations |
242 | *x86*) |
242 | *x86*) |
243 | PLATFORM_CFLAGS="-DFPM_INTEL" |
243 | PLATFORM_CFLAGS="-DFPM_INTEL" |
244 | # For the ipaq use ARM asm optimizations |
244 | # For the ipaq use ARM asm optimizations |
245 | ;; *ipaq*) |
245 | ;; *ipaq*|*sharp*) |
246 | PLATFORM_CFLAGS="-DFPM_ARM" |
246 | PLATFORM_CFLAGS="-DFPM_ARM" |
247 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
247 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
248 | # For generic platforms use the C 64-bit implementation |
248 | # For generic platforms use the C 64-bit implementation |
249 | ;; *generic*) |
249 | ;; *generic*) |
250 | PLATFORM_CFLAGS="-DFPM_64BIT" |
250 | PLATFORM_CFLAGS="-DFPM_64BIT" |
251 | # For 'other platforms' use the ARM code |
251 | # For 'other platforms' use the ARM code |
252 | ;; *) |
252 | ;; *) |
253 | PLATFORM_CFLAGS="-DFPM_ARM" |
253 | PLATFORM_CFLAGS="-DFPM_ARM" |
254 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
254 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
255 | esac |
255 | esac |
256 | fi |
256 | fi |
257 | if [ -n "$PLATFORM_CFLAGS" ] |
257 | if [ -n "$PLATFORM_CFLAGS" ] |
258 | then |
258 | then |
259 | # Append the addition c-flags we have defined |
259 | # Append the addition c-flags we have defined |
260 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
260 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
261 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
261 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
262 | fi |
262 | fi |
263 | cat $TARGET >> $N |
263 | cat $TARGET >> $N |
264 | if [ -n "$SED" ] |
264 | if [ -n "$SED" ] |
265 | then |
265 | then |
266 | sed -e "$SED" $M >> $N |
266 | sed -e "$SED" $M >> $N |
267 | else |
267 | else |
268 | cat $M >> $N |
268 | cat $M >> $N |
269 | fi |
269 | fi |
270 | |
270 | |
271 | cat >> $N <<EOF |
271 | cat >> $N <<EOF |
272 | |
272 | |
273 | lupdate: |
273 | lupdate: |
274 | lupdate $f.pro |
274 | lupdate $f.pro |
275 | |
275 | |
276 | lrelease: |
276 | lrelease: |
277 | lrelease $f.pro |
277 | lrelease $f.pro |
278 | |
278 | |
279 | EOF |
279 | EOF |
280 | if [ -f "$O" ] |
280 | if [ -f "$O" ] |
281 | then |
281 | then |
282 | cat >> $N $O |
282 | cat >> $N $O |
283 | fi |
283 | fi |
284 | |
284 | |
285 | done |
285 | done |
286 | |
286 | |
287 | MAKE=make |
287 | MAKE=make |
288 | echo |
288 | echo |
289 | echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)." |
289 | echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)." |
290 | echo "To reconfigure, run $MAKE clean and configure." |
290 | echo "To reconfigure, run $MAKE clean and configure." |
291 | echo |
291 | echo |
|