| -rwxr-xr-x | configure | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -143,8 +143,10 @@ mkdir -p include/qtopia/private mkdir -p include/opie ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) ( cd include/opie && ln -s ../../libsql/*.h .; ) ( cd include/opie && ln -s ../../libopie/pim/*.h .; ) +( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ + ln -s ../../libopie/$generatedHeader $generatedHeader; done ) echo Creating makefiles... # Set version for library directly @@ -213,9 +215,9 @@ EOF if [ "$f" = "embeddedkonsole" ] then case $PLATFORM in - *x86*|*generic*|*ipaq*|*sharp*) + *x86*|*generic*|*ipaq*|*oz*|*sharp*) SED="$SED /^LIBS.*=/s/\$/ -lutil/;" PLATFORM_CFLAGS="-DHAVE_OPENPTY" ;; *) SED= @@ -235,9 +237,9 @@ EOF # For generic turn on using floating point ;; *generic*) PLATFORM_CFLAGS="" # For the ipaq use fixed point maths, don't compile the mmx or css code - ;; *ipaq*|*sharp*) + ;; *ipaq*|*oz*|*sharp*) PLATFORM_CFLAGS="-DUSE_FIXED_POINT" ;; *) # For 'other platforms', turn off optimizations and use fixed point PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" @@ -250,9 +252,9 @@ EOF # For x86 use intel optimizations *x86*) PLATFORM_CFLAGS="-DFPM_INTEL" # For the ipaq use ARM asm optimizations - ;; *ipaq*|*sharp*) + ;; *ipaq*|*oz*|*sharp*) PLATFORM_CFLAGS="-DFPM_ARM" SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" # For generic platforms use the C 64-bit implementation ;; *generic*) @@ -262,13 +264,15 @@ EOF PLATFORM_CFLAGS="-DFPM_ARM" SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" esac fi + SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;" + PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS"; if [ -n "$PLATFORM_CFLAGS" ] then # Append the addition c-flags we have defined SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" - SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" + SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;" fi cat $TARGET >> $N if [ -n "$SED" ] then |