|
diff --git a/configure b/configure index 0445aa4..b7cb702 100755 --- a/ configure+++ b/ configure |
|
@@ -239,66 +239,66 @@ EOF |
239 | PLATFORM_CFLAGS="" |
239 | PLATFORM_CFLAGS="" |
240 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
240 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
241 | ;; *ipaq*|*oz*|*sharp*) |
241 | ;; *ipaq*|*oz*|*sharp*) |
242 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
242 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
243 | ;; *) |
243 | ;; *) |
244 | # For 'other platforms', turn off optimizations and use fixed point |
244 | # For 'other platforms', turn off optimizations and use fixed point |
245 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
245 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
246 | esac |
246 | esac |
247 | elif [ "$f" = "libmad" ] |
247 | elif [ "$f" = "libmad" ] |
248 | then |
248 | then |
249 | # Patch our Makefile.in file with the platform specifics for the libmad library |
249 | # Patch our Makefile.in file with the platform specifics for the libmad library |
250 | case $PLATFORM |
250 | case $PLATFORM |
251 | in |
251 | in |
252 | # For x86 use intel optimizations |
252 | # For x86 use intel optimizations |
253 | *x86*) |
253 | *x86*) |
254 | PLATFORM_CFLAGS="-DFPM_INTEL" |
254 | PLATFORM_CFLAGS="-DFPM_INTEL" |
255 | # For the ipaq use ARM asm optimizations |
255 | # For the ipaq use ARM asm optimizations |
256 | ;; *ipaq*|*oz*|*sharp*) |
256 | ;; *ipaq*|*oz*|*sharp*) |
257 | PLATFORM_CFLAGS="-DFPM_ARM" |
257 | PLATFORM_CFLAGS="-DFPM_ARM" |
258 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
258 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
259 | # For generic platforms use the C 64-bit implementation |
259 | # For generic platforms use the C 64-bit implementation |
260 | ;; *generic*) |
260 | ;; *generic*) |
261 | PLATFORM_CFLAGS="-DFPM_64BIT" |
261 | PLATFORM_CFLAGS="-DFPM_64BIT" |
262 | # For 'other platforms' use the ARM code |
262 | # For 'other platforms' use the ARM code |
263 | ;; *) |
263 | ;; *) |
264 | PLATFORM_CFLAGS="-DFPM_ARM" |
264 | PLATFORM_CFLAGS="-DFPM_ARM" |
265 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
265 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
266 | esac |
266 | esac |
267 | fi |
267 | fi |
268 | SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;" |
268 | SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;" |
269 | PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS"; |
269 | PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS"; |
270 | if [ -n "$PLATFORM_CFLAGS" ] |
270 | if [ -n "$PLATFORM_CFLAGS" ] |
271 | then |
271 | then |
272 | # Append the addition c-flags we have defined |
272 | # Append the addition c-flags we have defined |
273 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
273 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
274 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;" |
274 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;" |
275 | fi |
275 | fi |
276 | cat $TARGET >> $N |
276 | cat $TARGET >> $N |
277 | if [ -n "$SED" ] |
277 | if [ -n "$SED" ] |
278 | then |
278 | then |
279 | sed -e "$SED" $M >> $N |
279 | sed -e "$SED" $M >> $N |
280 | else |
280 | else |
281 | cat $M >> $N |
281 | cat $M >> $N |
282 | fi |
282 | fi |
283 | |
283 | |
284 | cat >> $N <<EOF |
284 | cat >> $N <<EOF |
285 | |
285 | |
286 | lupdate: |
286 | lupdate: |
287 | lupdate $f.pro |
287 | lupdate -noobsolete $f.pro |
288 | |
288 | |
289 | lrelease: |
289 | lrelease: |
290 | lrelease $f.pro |
290 | lrelease $f.pro |
291 | |
291 | |
292 | EOF |
292 | EOF |
293 | if [ -f "$O" ] |
293 | if [ -f "$O" ] |
294 | then |
294 | then |
295 | cat >> $N $O |
295 | cat >> $N $O |
296 | fi |
296 | fi |
297 | |
297 | |
298 | done |
298 | done |
299 | |
299 | |
300 | MAKE=make |
300 | MAKE=make |
301 | echo |
301 | echo |
302 | echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)." |
302 | echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)." |
303 | echo "To reconfigure, run $MAKE clean and configure." |
303 | echo "To reconfigure, run $MAKE clean and configure." |
304 | echo |
304 | echo |
|