summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 7db2738..9de0276 100755
--- a/configure
+++ b/configure
@@ -132,96 +132,97 @@ then
132fi 132fi
133 133
134mkdir -p include/qpe 134mkdir -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
137mkdir -p include/opie 137mkdir -p include/opie
138( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) 138( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
139 139
140 140
141echo Creating makefiles... 141echo Creating makefiles...
142 142
143sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v 143sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v
144mv library/library.pro-v library/library.pro 144mv library/library.pro-v library/library.pro
145 145
146if [ "$QT3" = yes ] 146if [ "$QT3" = yes ]
147then 147then
148 VCONFIG="CONFIG+=qt3" 148 VCONFIG="CONFIG+=qt3"
149else 149else
150 VCONFIG="CONFIG+=qt2" 150 VCONFIG="CONFIG+=qt2"
151fi 151fi
152 152
153if [ -f $TMAKEPATH/tmake.conf ] 153if [ -f $TMAKEPATH/tmake.conf ]
154then 154then
155 # You have tmake. We'll regenerate the file for you... 155 # You have tmake. We'll regenerate the file for you...
156 echo "Makefiles will be regenerated." 156 echo "Makefiles will be regenerated."
157fi 157fi
158 158
159H=`pwd` 159H=`pwd`
160if [ -z "$TOMAKE" ] 160if [ -z "$TOMAKE" ]
161then 161then
162 TOMAKE=`make showcomponents` 162 TOMAKE=`make showcomponents`
163fi 163fi
164 164
165for a in $TOMAKE ; do 165for a in $TOMAKE ; do
166 N=$a/Makefile 166 N=$a/Makefile
167 M=$a/Makefile.in 167 M=$a/Makefile.in
168 O=$a/Makefile.add 168 O=$a/Makefile.add
169 f=`basename $a` 169 f=`basename $a`
170 170
171 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] 171 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ]
172 then 172 then
173 ( cd $a; 173 ( cd $a;
174 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 174 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
175 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 175 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
176 -t $H/qt/tmake/propagate.t $f.pro | 176 -t $H/qt/tmake/propagate.t $f.pro |
177 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; 177 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
178 ) 178 )
179 echo -n "." 179 echo -n "."
180 #echo Building $N..
180 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` 181 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'`
181 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` 182 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
182 if [ -n "$translation" -a -n "$appname" ] 183 if [ -n "$translation" -a -n "$appname" ]
183 then 184 then
184 if [ $appname != $translation ] 185 if [ $appname != $translation ]
185 then 186 then
186 echo 187 echo
187 echo "Warning: translation and appname disagree in $a/$f.pro" 188 echo "Warning: translation and appname disagree in $a/$f.pro"
188 fi 189 fi
189 fi 190 fi
190 191
191 fi 192 fi
192 193
193 cat > $N <<EOF 194 cat > $N <<EOF
194############################################################################# 195#############################################################################
195# Automatically generated from $M 196# Automatically generated from $M
196# Build options from $1 197# Build options from $1
197############################################################################# 198#############################################################################
198 199
199EOF 200EOF
200 201
201 SED= 202 SED=
202 PLATFORM_CFLAGS= 203 PLATFORM_CFLAGS=
203 204
204 if [ "$f" = "embeddedkonsole" ] 205 if [ "$f" = "embeddedkonsole" ]
205 then 206 then
206 case $PLATFORM in 207 case $PLATFORM in
207 *x86*|*generic*|*ipaq*) 208 *x86*|*generic*|*ipaq*)
208 SED="$SED /^LIBS.*=/s/\$/ -lutil/;" 209 SED="$SED /^LIBS.*=/s/\$/ -lutil/;"
209 PLATFORM_CFLAGS="-DHAVE_OPENPTY" 210 PLATFORM_CFLAGS="-DHAVE_OPENPTY"
210 ;; *) 211 ;; *)
211 SED= 212 SED=
212 esac 213 esac
213 elif [ "$f" = "libmpeg3" ] 214 elif [ "$f" = "libmpeg3" ]
214 then 215 then
215 # Patch our Makefile.in file with the platform specifics for the libmpeg3 library 216 # Patch our Makefile.in file with the platform specifics for the libmpeg3 library
216 # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) 217 # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code)
217 SED='s/\$(CC)/\$(CXX)/;' 218 SED='s/\$(CC)/\$(CXX)/;'
218 case $PLATFORM 219 case $PLATFORM
219 in 220 in
220 # For x86 turn on using floating point, compile mmx and css code 221 # For x86 turn on using floating point, compile mmx and css code
221 *x86*) 222 *x86*)
222 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" 223 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486"
223 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" 224 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS"
224 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" 225 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;"
225 # For generic turn on using floating point 226 # For generic turn on using floating point
226 ;; *generic*) 227 ;; *generic*)
227 PLATFORM_CFLAGS="" 228 PLATFORM_CFLAGS=""