| author | kergoth <kergoth> | 2002-11-01 22:18:04 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-11-01 22:18:04 (UTC) |
| commit | efbd14a8c566c7ed1c87068543ad7867519eeea1 (patch) (side-by-side diff) | |
| tree | c9335aa5739d44fa612fef0298f4e6e3a25c6130 /configure | |
| parent | 438b8c09d5d18756f19bfa6043ad480a70e9267c (diff) | |
| download | opie-efbd14a8c566c7ed1c87068543ad7867519eeea1.zip opie-efbd14a8c566c7ed1c87068543ad7867519eeea1.tar.gz opie-efbd14a8c566c7ed1c87068543ad7867519eeea1.tar.bz2 | |
Applied tronical's patch to correct linking on generated headers in libopie.
| -rwxr-xr-x | configure | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -145,4 +145,6 @@ mkdir -p include/opie ( 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... @@ -215,5 +217,5 @@ EOF then case $PLATFORM in - *x86*|*generic*|*ipaq*|*sharp*) + *x86*|*generic*|*ipaq*|*oz*|*sharp*) SED="$SED /^LIBS.*=/s/\$/ -lutil/;" PLATFORM_CFLAGS="-DHAVE_OPENPTY" @@ -237,5 +239,5 @@ EOF 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" ;; *) @@ -252,5 +254,5 @@ EOF 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 /;" @@ -264,9 +266,11 @@ EOF 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 |