|
diff --git a/configure b/configure index 7949bf4..a990539 100755 --- a/ configure+++ b/ configure |
|
@@ -135,24 +135,26 @@ then |
135 | fi |
135 | fi |
136 | |
136 | |
137 | mkdir -p include/qpe |
137 | mkdir -p include/qpe |
138 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
138 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
139 | mkdir -p include/qtopia |
139 | mkdir -p include/qtopia |
140 | ( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; ) |
140 | ( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; ) |
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 |
153 | mv library/library.pro-v library/library.pro |
155 | mv library/library.pro-v library/library.pro |
154 | |
156 | |
155 | if [ "$QT3" = yes ] |
157 | if [ "$QT3" = yes ] |
156 | then |
158 | then |
157 | VCONFIG="CONFIG+=qt3" |
159 | VCONFIG="CONFIG+=qt3" |
158 | else |
160 | else |
@@ -205,78 +207,80 @@ for a in $TOMAKE ; do |
205 | # Automatically generated from $M |
207 | # Automatically generated from $M |
206 | # Build options from $1 |
208 | # Build options from $1 |
207 | ############################################################################# |
209 | ############################################################################# |
208 | |
210 | |
209 | EOF |
211 | EOF |
210 | |
212 | |
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" ] |
224 | then |
226 | then |
225 | # 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 |
226 | # 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) |
227 | SED='s/\$(CC)/\$(CXX)/;' |
229 | SED='s/\$(CC)/\$(CXX)/;' |
228 | case $PLATFORM |
230 | case $PLATFORM |
229 | in |
231 | in |
230 | # 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 |
231 | *x86*) |
233 | *x86*) |
232 | # "-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" |
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" ] |
246 | then |
248 | then |
247 | # 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 |
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 |
277 | cat $M >> $N |
281 | cat $M >> $N |
278 | fi |
282 | fi |
279 | |
283 | |
280 | cat >> $N <<EOF |
284 | cat >> $N <<EOF |
281 | |
285 | |
282 | lupdate: |
286 | lupdate: |
|