author | cniehaus <cniehaus> | 2002-12-13 16:12:31 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-12-13 16:12:31 (UTC) |
commit | 841d22f7678efa02bb73476e7f5214e4323ef260 (patch) (unidiff) | |
tree | bb8677060855ae4b594a6c1bccdd6523ca54c93a /configure | |
parent | eafb2c268d06c762d6c818e78c9a652d74914541 (diff) | |
download | opie-841d22f7678efa02bb73476e7f5214e4323ef260.zip opie-841d22f7678efa02bb73476e7f5214e4323ef260.tar.gz opie-841d22f7678efa02bb73476e7f5214e4323ef260.tar.bz2 |
4 updates .pro-files (due to i18n-stuff)
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -191,114 +191,114 @@ for a in $TOMAKE ; do | |||
191 | #echo Building $N.. | 191 | #echo Building $N.. |
192 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"` | 192 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"` |
193 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` | 193 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
194 | if [ -n "$translation" -a -n "$appname" ] | 194 | if [ -n "$translation" -a -n "$appname" ] |
195 | then | 195 | then |
196 | if [ "$appname" != "$translation" ] | 196 | if [ "$appname" != "$translation" ] |
197 | then | 197 | then |
198 | echo | 198 | echo |
199 | echo "Warning: translation and appname disagree in $a/$f.pro" | 199 | echo "Warning: translation and appname disagree in $a/$f.pro" |
200 | fi | 200 | fi |
201 | fi | 201 | fi |
202 | 202 | ||
203 | fi | 203 | fi |
204 | 204 | ||
205 | cat > $N <<EOF | 205 | cat > $N <<EOF |
206 | ############################################################################# | 206 | ############################################################################# |
207 | # Automatically generated from $M | 207 | # Automatically generated from $M |
208 | # Build options from $1 | 208 | # Build options from $1 |
209 | ############################################################################# | 209 | ############################################################################# |
210 | 210 | ||
211 | EOF | 211 | EOF |
212 | 212 | ||
213 | SED= | 213 | SED= |
214 | PLATFORM_CFLAGS= | 214 | PLATFORM_CFLAGS= |
215 | 215 | ||
216 | if [ "$f" = "embeddedkonsole" ] | 216 | if [ "$f" = "embeddedkonsole" ] |
217 | then | 217 | then |
218 | case $PLATFORM in | 218 | case $PLATFORM in |
219 | *x86*|*generic*|*ipaq*|*oz*|*sharp*) | 219 | *x86*|*generic*|*ipaq*|*oz*|*sharp*) |
220 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" | 220 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
221 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" | 221 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
222 | ;; *) | 222 | ;; *) |
223 | SED= | 223 | SED= |
224 | esac | 224 | esac |
225 | elif [ "$f" = "libmpeg3" ] | 225 | elif [ "$f" = "libmpeg3" ] |
226 | then | 226 | then |
227 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library | 227 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library |
228 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) | 228 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) |
229 | SED='s/\$(CC)/\$(CXX)/;' | 229 | SED='s/\$(CC)/\$(CXX)/;' |
230 | case $PLATFORM | 230 | case $PLATFORM |
231 | in | 231 | in |
232 | # For x86 turn on using floating point, compile mmx and css code | 232 | # For x86 turn on using floating point, compile mmx and css code |
233 | *x86*) | 233 | *x86*) |
234 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" | 234 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" |
235 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" | 235 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
236 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" | 236 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
237 | # For generic turn on using floating point | 237 | # For generic turn on using floating point |
238 | ;; *generic*) | 238 | ;; *generic*) |
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 |