|
diff --git a/configure b/configure index cfc4c39..7e9ab68 100755 --- a/ configure+++ b/ configure |
|
@@ -195,99 +195,99 @@ for a in $TOMAKE ; do |
195 | |
195 | |
196 | cat > $N <<EOF |
196 | cat > $N <<EOF |
197 | ############################################################################# |
197 | ############################################################################# |
198 | # Automatically generated from $M |
198 | # Automatically generated from $M |
199 | # Build options from $1 |
199 | # Build options from $1 |
200 | ############################################################################# |
200 | ############################################################################# |
201 | |
201 | |
202 | EOF |
202 | EOF |
203 | |
203 | |
204 | SED= |
204 | SED= |
205 | PLATFORM_CFLAGS= |
205 | PLATFORM_CFLAGS= |
206 | |
206 | |
207 | if [ "$f" = "embeddedkonsole" ] |
207 | if [ "$f" = "embeddedkonsole" ] |
208 | then |
208 | then |
209 | case $PLATFORM in |
209 | case $PLATFORM in |
210 | *x86*|*generic*|*ipaq*|*sharp*) |
210 | *x86*|*generic*|*ipaq*|*sharp*) |
211 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
211 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
212 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
212 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
213 | ;; *) |
213 | ;; *) |
214 | SED= |
214 | SED= |
215 | esac |
215 | esac |
216 | elif [ "$f" = "libmpeg3" ] |
216 | elif [ "$f" = "libmpeg3" ] |
217 | then |
217 | then |
218 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library |
218 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library |
219 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) |
219 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) |
220 | SED='s/\$(CC)/\$(CXX)/;' |
220 | SED='s/\$(CC)/\$(CXX)/;' |
221 | case $PLATFORM |
221 | case $PLATFORM |
222 | in |
222 | in |
223 | # For x86 turn on using floating point, compile mmx and css code |
223 | # For x86 turn on using floating point, compile mmx and css code |
224 | *x86*) |
224 | *x86*) |
225 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" |
225 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" |
226 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
226 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
227 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
227 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
228 | # For generic turn on using floating point |
228 | # For generic turn on using floating point |
229 | ;; *generic*) |
229 | ;; *generic*) |
230 | PLATFORM_CFLAGS="" |
230 | PLATFORM_CFLAGS="" |
231 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
231 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
232 | ;; *ipaq*|*sharp*) |
232 | ;; *ipaq*|*sharp*) |
233 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
233 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
234 | ;; *) |
234 | ;; *) |
235 | # For 'other platforms', turn off optimizations and use fixed point |
235 | # For 'other platforms', turn off optimizations and use fixed point |
236 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
236 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
237 | esac |
237 | esac |
238 | elif [ "$f" = "libmad" ] |
238 | elif [ "$f" = "libmad" ] |
239 | then |
239 | then |
240 | # Patch our Makefile.in file with the platform specifics for the libmad library |
240 | # Patch our Makefile.in file with the platform specifics for the libmad library |
241 | case $PLATFORM |
241 | case $PLATFORM |
242 | in |
242 | in |
243 | # For x86 use intel optimizations |
243 | # For x86 use intel optimizations |
244 | *x86*) |
244 | *x86*) |
245 | PLATFORM_CFLAGS="-DFPM_INTEL" |
245 | PLATFORM_CFLAGS="-DFPM_INTEL" |
246 | # For the ipaq use ARM asm optimizations |
246 | # For the ipaq use ARM asm optimizations |
247 | ;; *ipaq*|*sharp*) |
247 | ;; *ipaq*|*sharp*) |
248 | PLATFORM_CFLAGS="-DFPM_ARM" |
248 | PLATFORM_CFLAGS="-DFPM_ARM" |
249 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
249 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
250 | # For generic platforms use the C 64-bit implementation |
250 | # For generic platforms use the C 64-bit implementation |
251 | ;; *generic*) |
251 | ;; *generic*) |
252 | PLATFORM_CFLAGS="-DFPM_64BIT" |
252 | PLATFORM_CFLAGS="-DFPM_64BIT" |
253 | # For 'other platforms' use the ARM code |
253 | # For 'other platforms' use the ARM code |
254 | ;; *) |
254 | ;; *) |
255 | PLATFORM_CFLAGS="-DFPM_ARM" |
255 | PLATFORM_CFLAGS="-DFPM_ARM" |
256 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
256 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
257 | esac |
257 | esac |
258 | fi |
258 | fi |
259 | if [ -n "$PLATFORM_CFLAGS" ] |
259 | if [ -n "$PLATFORM_CFLAGS" ] |
260 | then |
260 | then |
261 | # Append the addition c-flags we have defined |
261 | # Append the addition c-flags we have defined |
262 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
262 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
263 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
263 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
264 | fi |
264 | fi |
265 | cat $TARGET >> $N |
265 | cat $TARGET >> $N |
266 | if [ -n "$SED" ] |
266 | if [ -n "$SED" ] |
267 | then |
267 | then |
268 | sed -e "$SED" $M >> $N |
268 | sed -e "$SED" $M >> $N |
269 | else |
269 | else |
270 | cat $M >> $N |
270 | cat $M >> $N |
271 | fi |
271 | fi |
272 | |
272 | |
273 | cat >> $N <<EOF |
273 | cat >> $N <<EOF |
274 | |
274 | |
275 | lupdate: |
275 | lupdate: |
276 | lupdate $f.pro |
276 | lupdate $f.pro |
277 | |
277 | |
278 | lrelease: |
278 | lrelease: |
279 | lrelease $f.pro |
279 | lrelease $f.pro |
280 | |
280 | |
281 | EOF |
281 | EOF |
282 | if [ -f "$O" ] |
282 | if [ -f "$O" ] |
283 | then |
283 | then |
284 | cat >> $N $O |
284 | cat >> $N $O |
285 | fi |
285 | fi |
286 | |
286 | |
287 | done |
287 | done |
288 | |
288 | |
289 | MAKE=make |
289 | MAKE=make |
290 | echo |
290 | echo |
291 | echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)." |
291 | echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)." |
292 | echo "To reconfigure, run $MAKE clean and configure." |
292 | echo "To reconfigure, run $MAKE clean and configure." |
293 | echo |
293 | echo |
|