summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-01 22:18:04 (UTC)
committer kergoth <kergoth>2002-11-01 22:18:04 (UTC)
commitefbd14a8c566c7ed1c87068543ad7867519eeea1 (patch) (side-by-side diff)
treec9335aa5739d44fa612fef0298f4e6e3a25c6130
parent438b8c09d5d18756f19bfa6043ad480a70e9267c (diff)
downloadopie-efbd14a8c566c7ed1c87068543ad7867519eeea1.zip
opie-efbd14a8c566c7ed1c87068543ad7867519eeea1.tar.gz
opie-efbd14a8c566c7ed1c87068543ad7867519eeea1.tar.bz2
Applied tronical's patch to correct linking on generated headers in libopie.
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure12
1 files changed, 8 insertions, 4 deletions
diff --git a/configure b/configure
index 7949bf4..a990539 100755
--- a/configure
+++ b/configure
@@ -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