|
diff --git a/configure b/configure index 1652527..e81bc95 100755 --- a/ configure+++ b/ configure |
|
@@ -113,129 +113,129 @@ The defaults (*) are usually acceptable. Here is a short explanation of |
113 | each option: |
113 | each option: |
114 | |
114 | |
115 | * -release ........... Compile and link Qt with debugging turned off. |
115 | * -release ........... Compile and link Qt with debugging turned off. |
116 | -debug ............. Compile and link Qt with debugging turned on. |
116 | -debug ............. Compile and link Qt with debugging turned on. |
117 | |
117 | |
118 | * -shared ............ Create and use a shared Qt library (libqt.so) |
118 | * -shared ............ Create and use a shared Qt library (libqt.so) |
119 | -static ............ Create and use a static Qt library (libqt.a) |
119 | -static ............ Create and use a static Qt library (libqt.a) |
120 | |
120 | |
121 | -qt3 ............... Configure for use with Qt 3.x |
121 | -qt3 ............... Configure for use with Qt 3.x |
122 | |
122 | |
123 | -platform target ... The platform you are building on ($PLATFORM) |
123 | -platform target ... The platform you are building on ($PLATFORM) |
124 | EOF |
124 | EOF |
125 | exit 0; |
125 | exit 0; |
126 | fi |
126 | fi |
127 | |
127 | |
128 | if [ -f library/custom-$PLATFORM.h ] |
128 | if [ -f library/custom-$PLATFORM.h ] |
129 | then |
129 | then |
130 | rm -f library/custom.h |
130 | rm -f library/custom.h |
131 | ln -s custom-$PLATFORM.h library/custom.h |
131 | ln -s custom-$PLATFORM.h library/custom.h |
132 | fi |
132 | fi |
133 | |
133 | |
134 | mkdir -p include/qpe |
134 | mkdir -p include/qpe |
135 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
135 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
136 | |
136 | |
137 | echo Creating makefiles... |
137 | echo Creating makefiles... |
138 | |
138 | |
139 | sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
139 | sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
140 | mv library/library.pro-v library/library.pro |
140 | mv library/library.pro-v library/library.pro |
141 | |
141 | |
142 | if [ "$QT3" = yes ] |
142 | if [ "$QT3" = yes ] |
143 | then |
143 | then |
144 | VCONFIG="CONFIG+=qt3" |
144 | VCONFIG="CONFIG+=qt3" |
145 | else |
145 | else |
146 | VCONFIG="CONFIG+=qt2" |
146 | VCONFIG="CONFIG+=qt2" |
147 | fi |
147 | fi |
148 | |
148 | |
149 | if [ -f $TMAKEPATH/tmake.conf ] |
149 | if [ -f $TMAKEPATH/tmake.conf ] |
150 | then |
150 | then |
151 | # You have tmake. We'll regenerate the file for you... |
151 | # You have tmake. We'll regenerate the file for you... |
152 | echo "Makefiles will be regenerated." |
152 | echo "Makefiles will be regenerated." |
153 | fi |
153 | fi |
154 | |
154 | |
155 | H=`pwd` |
155 | H=`pwd` |
156 | if [ -z "$TOMAKE" ] |
156 | if [ -z "$TOMAKE" ] |
157 | then |
157 | then |
158 | TOMAKE=`make showcomponents` |
158 | TOMAKE=`make showcomponents` |
159 | fi |
159 | fi |
160 | |
160 | |
161 | for a in $TOMAKE ; do |
161 | for a in $TOMAKE ; do |
162 | N=$a/Makefile |
162 | N=$a/Makefile |
163 | M=$a/Makefile.in |
163 | M=$a/Makefile.in |
164 | O=$a/Makefile.add |
164 | O=$a/Makefile.add |
165 | f=`basename $a` |
165 | f=`basename $a` |
166 | |
166 | |
167 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
167 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
168 | then |
168 | then |
169 | ( cd $a; |
169 | ( cd $a; |
170 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
170 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
171 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
171 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
172 | -t $H/qt/tmake/propagate.t $f.pro | |
172 | -t $H/qt/tmake/propagate.t $f.pro | |
173 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
173 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
174 | ) |
174 | ) |
175 | echo -n "." |
175 | echo -n "." |
176 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
176 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
177 | translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
177 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
178 | if [ -n "$translation" -a -n "$appname" ] |
178 | if [ -n "$translation" -a -n "$appname" ] |
179 | then |
179 | then |
180 | if [ $appname != $translation ] |
180 | if [ $appname != $translation ] |
181 | then |
181 | then |
182 | echo |
182 | echo |
183 | echo "Warning: translation and appname disagree in $a/$f.pro" |
183 | echo "Warning: translation and appname disagree in $a/$f.pro" |
184 | fi |
184 | fi |
185 | fi |
185 | fi |
186 | |
186 | |
187 | fi |
187 | fi |
188 | |
188 | |
189 | cat > $N <<EOF |
189 | cat > $N <<EOF |
190 | ############################################################################# |
190 | ############################################################################# |
191 | # Automatically generated from $M |
191 | # Automatically generated from $M |
192 | # Build options from $1 |
192 | # Build options from $1 |
193 | ############################################################################# |
193 | ############################################################################# |
194 | |
194 | |
195 | EOF |
195 | EOF |
196 | |
196 | |
197 | SED= |
197 | SED= |
198 | PLATFORM_CFLAGS= |
198 | PLATFORM_CFLAGS= |
199 | |
199 | |
200 | if [ "$f" = "embeddedkonsole" ] |
200 | if [ "$f" = "embeddedkonsole" ] |
201 | then |
201 | then |
202 | case $PLATFORM in |
202 | case $PLATFORM in |
203 | *x86*|*generic*|*ipaq*) |
203 | *x86*|*generic*|*ipaq*) |
204 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
204 | SED="$SED /^LIBS.*=/s/\$/ -lutil/;" |
205 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
205 | PLATFORM_CFLAGS="-DHAVE_OPENPTY" |
206 | ;; *) |
206 | ;; *) |
207 | SED= |
207 | SED= |
208 | esac |
208 | esac |
209 | elif [ "$f" = "libmpeg3" ] |
209 | elif [ "$f" = "libmpeg3" ] |
210 | then |
210 | then |
211 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library |
211 | # Patch our Makefile.in file with the platform specifics for the libmpeg3 library |
212 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) |
212 | # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) |
213 | SED='s/\$(CC)/\$(CXX)/;' |
213 | SED='s/\$(CC)/\$(CXX)/;' |
214 | case $PLATFORM |
214 | case $PLATFORM |
215 | in |
215 | in |
216 | # For x86 turn on using floating point, compile mmx and css code |
216 | # For x86 turn on using floating point, compile mmx and css code |
217 | *x86*) |
217 | *x86*) |
218 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" |
218 | # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" |
219 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
219 | PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" |
220 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
220 | SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" |
221 | # For generic turn on using floating point |
221 | # For generic turn on using floating point |
222 | ;; *generic*) |
222 | ;; *generic*) |
223 | PLATFORM_CFLAGS="" |
223 | PLATFORM_CFLAGS="" |
224 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
224 | # For the ipaq use fixed point maths, don't compile the mmx or css code |
225 | ;; *ipaq*) |
225 | ;; *ipaq*) |
226 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
226 | PLATFORM_CFLAGS="-DUSE_FIXED_POINT" |
227 | ;; *) |
227 | ;; *) |
228 | # For 'other platforms', turn off optimizations and use fixed point |
228 | # For 'other platforms', turn off optimizations and use fixed point |
229 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
229 | PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" |
230 | esac |
230 | esac |
231 | elif [ "$f" = "libmad" ] |
231 | elif [ "$f" = "libmad" ] |
232 | then |
232 | then |
233 | # Patch our Makefile.in file with the platform specifics for the libmad library |
233 | # Patch our Makefile.in file with the platform specifics for the libmad library |
234 | case $PLATFORM |
234 | case $PLATFORM |
235 | in |
235 | in |
236 | # For x86 use intel optimizations |
236 | # For x86 use intel optimizations |
237 | *x86*) |
237 | *x86*) |
238 | PLATFORM_CFLAGS="-DFPM_INTEL" |
238 | PLATFORM_CFLAGS="-DFPM_INTEL" |
239 | # For the ipaq use ARM asm optimizations |
239 | # For the ipaq use ARM asm optimizations |
240 | ;; *ipaq*) |
240 | ;; *ipaq*) |
241 | PLATFORM_CFLAGS="-DFPM_ARM" |
241 | PLATFORM_CFLAGS="-DFPM_ARM" |
|