author | kergoth <kergoth> | 2002-11-01 22:18:04 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-01 22:18:04 (UTC) |
commit | efbd14a8c566c7ed1c87068543ad7867519eeea1 (patch) (unidiff) | |
tree | c9335aa5739d44fa612fef0298f4e6e3a25c6130 | |
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
@@ -141,12 +141,14 @@ mkdir -p include/qtopia | |||
141 | mkdir -p include/qtopia/private | 141 | mkdir -p include/qtopia/private |
142 | ( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; ) | 142 | ( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; ) |
143 | mkdir -p include/opie | 143 | mkdir -p include/opie |
144 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) | 144 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) |
145 | ( cd include/opie && ln -s ../../libsql/*.h .; ) | 145 | ( cd include/opie && ln -s ../../libsql/*.h .; ) |
146 | ( cd include/opie && ln -s ../../libopie/pim/*.h .; ) | 146 | ( cd include/opie && ln -s ../../libopie/pim/*.h .; ) |
147 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | ||
148 | ln -s ../../libopie/$generatedHeader $generatedHeader; done ) | ||
147 | 149 | ||
148 | echo Creating makefiles... | 150 | echo Creating makefiles... |
149 | 151 | ||
150 | # Set version for library directly | 152 | # Set version for library directly |
151 | # Version 1.5.0 right now for compat. | 153 | # Version 1.5.0 right now for compat. |
152 | sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v | 154 | sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
@@ -211,13 +213,13 @@ EOF | |||
211 | SED= | 213 | SED= |
212 | PLATFORM_CFLAGS= | 214 | PLATFORM_CFLAGS= |
213 | 215 | ||
214 | if [ "$f" = "embeddedkonsole" ] | 216 | if [ "$f" = "embeddedkonsole" ] |
215 | then | 217 | then |
216 | case $PLATFORM in | 218 | case $PLATFORM in |
217 | *x86*|*generic*|*ipaq*|*sharp*) | 219 | *x86*|*generic*|*ipaq*|*oz*|*sharp*) |
218 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" | 220 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
219 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" | 221 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
220 | ;; *) | 222 | ;; *) |
221 | SED= | 223 | SED= |
222 | esac | 224 | esac |
223 | elif [ "$f" = "libmpeg3" ] | 225 | elif [ "$f" = "libmpeg3" ] |
@@ -233,13 +235,13 @@ EOF | |||
233 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" | 235 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
234 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" | 236 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
235 | # For generic turn on using floating point | 237 | # For generic turn on using floating point |
236 | ;; *generic*) | 238 | ;; *generic*) |
237 | PLATFORM_CFLAGS="" | 239 | PLATFORM_CFLAGS="" |
238 | # 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 |
239 | ;; *ipaq*|*sharp*) | 241 | ;; *ipaq*|*oz*|*sharp*) |
240 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" | 242 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
241 | ;; *) | 243 | ;; *) |
242 | # For 'other platforms', turn off optimizations and use fixed point | 244 | # For 'other platforms', turn off optimizations and use fixed point |
243 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" | 245 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
244 | esac | 246 | esac |
245 | elif [ "$f" = "libmad" ] | 247 | elif [ "$f" = "libmad" ] |
@@ -248,29 +250,31 @@ EOF | |||
248 | case $PLATFORM | 250 | case $PLATFORM |
249 | in | 251 | in |
250 | # For x86 use intel optimizations | 252 | # For x86 use intel optimizations |
251 | *x86*) | 253 | *x86*) |
252 | PLATFORM_CFLAGS="-DFPM_INTEL" | 254 | PLATFORM_CFLAGS="-DFPM_INTEL" |
253 | # For the ipaq use ARM asm optimizations | 255 | # For the ipaq use ARM asm optimizations |
254 | ;; *ipaq*|*sharp*) | 256 | ;; *ipaq*|*oz*|*sharp*) |
255 | PLATFORM_CFLAGS="-DFPM_ARM" | 257 | PLATFORM_CFLAGS="-DFPM_ARM" |
256 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" | 258 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
257 | # For generic platforms use the C 64-bit implementation | 259 | # For generic platforms use the C 64-bit implementation |
258 | ;; *generic*) | 260 | ;; *generic*) |
259 | PLATFORM_CFLAGS="-DFPM_64BIT" | 261 | PLATFORM_CFLAGS="-DFPM_64BIT" |
260 | # For 'other platforms' use the ARM code | 262 | # For 'other platforms' use the ARM code |
261 | ;; *) | 263 | ;; *) |
262 | PLATFORM_CFLAGS="-DFPM_ARM" | 264 | PLATFORM_CFLAGS="-DFPM_ARM" |
263 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" | 265 | SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" |
264 | esac | 266 | esac |
265 | fi | 267 | fi |
268 | SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;" | ||
269 | PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS"; | ||
266 | if [ -n "$PLATFORM_CFLAGS" ] | 270 | if [ -n "$PLATFORM_CFLAGS" ] |
267 | then | 271 | then |
268 | # Append the addition c-flags we have defined | 272 | # Append the addition c-flags we have defined |
269 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" | 273 | SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" |
270 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" | 274 | SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;" |
271 | fi | 275 | fi |
272 | cat $TARGET >> $N | 276 | cat $TARGET >> $N |
273 | if [ -n "$SED" ] | 277 | if [ -n "$SED" ] |
274 | then | 278 | then |
275 | sed -e "$SED" $M >> $N | 279 | sed -e "$SED" $M >> $N |
276 | else | 280 | else |