Mercurial > mxe-octave

comparison src/qt-win32.patch @ 786:d3d9a4a2843d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert openssl hacks in configure and use pg_config in package qt
author Mark Brand <mabrand@mabrand.nl>
date Wed, 17 Feb 2010 21:57:56 +0100
parents 1d651946e889
children d57d5de5d4b2
comparison
equal deleted inserted replaced
785:1d651946e889 786:d3d9a4a2843d
1 This file is part of mingw-cross-env. 1 This file is part of mingw-cross-env.
2 See doc/index.html for further information. 2 See doc/index.html for further information.
3 3
4 diff --git a/configure b/configure 4 diff --git a/configure b/configure
5 index ed5891f..3873d7f 100755 5 index ed5891f..1a3f573 100755
6 --- a/configure 6 --- a/configure
7 +++ b/configure 7 +++ b/configure
8 @@ -605,7 +605,7 @@ mkdir -p "$outpath/config.tests" 8 @@ -605,7 +605,7 @@ mkdir -p "$outpath/config.tests"
9 rm -f "$outpath/config.tests/.qmake.cache" 9 rm -f "$outpath/config.tests/.qmake.cache"
10 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" 10 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
156 + CFG_LIBPNG=system 156 + CFG_LIBPNG=system
157 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 157 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
158 CFG_LIBPNG=system 158 CFG_LIBPNG=system
159 else 159 else
160 CFG_LIBPNG=qt 160 CFG_LIBPNG=qt
161 @@ -4679,7 +4720,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 161 @@ -4686,7 +4727,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
162 fi 162 fi
163 ;; 163 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
164 psql) 164 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
165 - if [ "$CFG_SQL_psql" != "no" ]; then 165 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
166 + if [ "$XPLATFORM" = "win32-g++" ]; then 166 + if [ "$XPLATFORM" = "win32-g++" ]; then
167 + echo "We cannot test for PostgreSQL support since we are cross building for win32-g++, so we assume it is there." 167 + echo "Skipping test for PSQL in cross build for win32-g++"
168 + CFG_SQL_psql=plugin 168 + if [ "$CFG_SQL_psql" = "auto" ]; then
169 + QT_LFLAGS_PSQL="-lpq -lsecur32 `$PKG_CONFIG --libs openssl`" 169 + CFG_SQL_psql=plugin
170 + elif [ "$CFG_SQL_psql" != "no" ]; then 170 + fi
171 if "$WHICH" pg_config >/dev/null 2>&1; then 171 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
172 QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` 172 if [ "$CFG_SQL_psql" = "auto" ]; then
173 QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` 173 CFG_SQL_psql=plugin
174 @@ -4707,7 +4752,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 174 fi
175 @@ -4707,7 +4753,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
175 ;; 176 ;;
176 odbc) 177 odbc)
177 if [ "$CFG_SQL_odbc" != "no" ]; then 178 if [ "$CFG_SQL_odbc" != "no" ]; then
178 - if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 179 - if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
179 + if [ "$XPLATFORM" = "win32-g++" ]; then 180 + if [ "$XPLATFORM" = "win32-g++" ]; then
181 + CFG_SQL_odbc=plugin 182 + CFG_SQL_odbc=plugin
182 + elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 183 + elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
183 if [ "$CFG_SQL_odbc" = "auto" ]; then 184 if [ "$CFG_SQL_odbc" = "auto" ]; then
184 CFG_SQL_odbc=plugin 185 CFG_SQL_odbc=plugin
185 fi 186 fi
186 @@ -4752,7 +4800,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 187 @@ -4752,7 +4801,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
187 ;; 188 ;;
188 tds) 189 tds)
189 if [ "$CFG_SQL_tds" != "no" ]; then 190 if [ "$CFG_SQL_tds" != "no" ]; then
190 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 191 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
191 + if [ "$XPLATFORM" = "win32-g++" ]; then 192 + if [ "$XPLATFORM" = "win32-g++" ]; then
195 + fi 196 + fi
196 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 197 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
197 if [ "$CFG_SQL_tds" = "auto" ]; then 198 if [ "$CFG_SQL_tds" = "auto" ]; then
198 CFG_SQL_tds=plugin 199 CFG_SQL_tds=plugin
199 fi 200 fi
200 @@ -4834,7 +4887,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 201 @@ -4834,7 +4888,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
201 QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` 202 QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
202 QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` 203 QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
203 fi 204 fi
204 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 205 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
205 + if [ "$XPLATFORM" = "win32-g++" ]; then 206 + if [ "$XPLATFORM" = "win32-g++" ]; then
210 + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" 211 + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
211 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 212 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
212 if [ "$CFG_SQL_sqlite" = "auto" ]; then 213 if [ "$CFG_SQL_sqlite" = "auto" ]; then
213 CFG_SQL_sqlite=plugin 214 CFG_SQL_sqlite=plugin
214 fi 215 fi
215 @@ -4905,7 +4964,9 @@ fi 216 @@ -4905,7 +4965,9 @@ fi
216 217
217 # auto-detect iconv(3) support 218 # auto-detect iconv(3) support
218 if [ "$CFG_ICONV" != "no" ]; then 219 if [ "$CFG_ICONV" != "no" ]; then
219 - if [ "$PLATFORM_QWS" = "yes" ]; then 220 - if [ "$PLATFORM_QWS" = "yes" ]; then
220 + if [ "$XPLATFORM" = "win32-g++" ]; then 221 + if [ "$XPLATFORM" = "win32-g++" ]; then
221 + CFG_ICONV=no 222 + CFG_ICONV=no
222 + elif [ "$PLATFORM_QWS" = "yes" ]; then 223 + elif [ "$PLATFORM_QWS" = "yes" ]; then
223 CFG_ICONV=no 224 CFG_ICONV=no
224 elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 225 elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
225 CFG_ICONV=yes 226 CFG_ICONV=yes
226 @@ -5065,7 +5126,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then 227 @@ -5065,7 +5127,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
227 echo "Basic XLib functionality test failed!" 228 echo "Basic XLib functionality test failed!"
228 echo " You might need to modify the include and library search paths by editing" 229 echo " You might need to modify the include and library search paths by editing"
229 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." 230 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
230 - exit 1 231 - exit 1
231 +echo NOTICE: This is a specially modifed configure script! 232 +echo NOTICE: This is a specially modifed configure script!
232 +echo For our purposes we do not want X11. 233 +echo For our purposes we do not want X11.
233 +# exit 1 234 +# exit 1
234 fi 235 fi
235 236
236 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) 237 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
237 @@ -5139,7 +5202,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then 238 @@ -5139,7 +5203,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
238 echo " You might need to modify the include and library search paths by editing" 239 echo " You might need to modify the include and library search paths by editing"
239 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" 240 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
240 echo " ${XQMAKESPEC}." 241 echo " ${XQMAKESPEC}."
241 - exit 1 242 - exit 1
242 +echo NOTICE: This is a specially modifed configure script! 243 +echo NOTICE: This is a specially modifed configure script!
243 +echo For our purposes we do not want the OpenGL functionality test. 244 +echo For our purposes we do not want the OpenGL functionality test.
244 +# exit 1 245 +# exit 1
245 fi 246 fi
246 case "$PLATFORM" in 247 case "$PLATFORM" in
247 hpux*) 248 hpux*)
248 @@ -5640,7 +5705,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then 249 @@ -5640,7 +5706,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
249 fi 250 fi
250 251
251 HAVE_STL=no 252 HAVE_STL=no
252 -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then 253 -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
253 +if [ "$XPLATFORM" = "win32-g++" ]; then 254 +if [ "$XPLATFORM" = "win32-g++" ]; then
255 + HAVE_STL=yes 256 + HAVE_STL=yes
256 +elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then 257 +elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
257 HAVE_STL=yes 258 HAVE_STL=yes
258 fi 259 fi
259 260
260 @@ -5662,7 +5730,10 @@ fi 261 @@ -5662,7 +5731,10 @@ fi
261 262
262 # find if the platform supports IPv6 263 # find if the platform supports IPv6
263 if [ "$CFG_IPV6" != "no" ]; then 264 if [ "$CFG_IPV6" != "no" ]; then
264 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 265 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
265 + if [ "$XPLATFORM" = "win32-g++" ]; then 266 + if [ "$XPLATFORM" = "win32-g++" ]; then
267 + CFG_IPV6=yes 268 + CFG_IPV6=yes
268 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 269 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
269 CFG_IPV6=yes 270 CFG_IPV6=yes
270 else 271 else
271 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then 272 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
272 @@ -5776,7 +5847,10 @@ fi 273 @@ -5776,7 +5848,10 @@ fi
273 274
274 # find if the platform supports X/Open Large File compilation environment 275 # find if the platform supports X/Open Large File compilation environment
275 if [ "$CFG_LARGEFILE" != "no" ]; then 276 if [ "$CFG_LARGEFILE" != "no" ]; then
276 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then 277 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
277 + if [ "$XPLATFORM" = "win32-g++" ]; then 278 + if [ "$XPLATFORM" = "win32-g++" ]; then
279 + CFG_LARGEFILE=yes 280 + CFG_LARGEFILE=yes
280 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then 281 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
281 CFG_LARGEFILE=yes 282 CFG_LARGEFILE=yes
282 else 283 else
283 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then 284 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
284 @@ -5793,7 +5867,9 @@ fi 285 @@ -5793,7 +5868,9 @@ fi
285 286
286 # detect OpenSSL 287 # detect OpenSSL
287 if [ "$CFG_OPENSSL" != "no" ]; then 288 if [ "$CFG_OPENSSL" != "no" ]; then
288 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 289 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
289 + if [ "$XPLATFORM" = "win32-g++" ]; then 290 + if [ "$XPLATFORM" = "win32-g++" ]; then
290 + echo "We cannot test for system CFG_OPENSSL since we are cross building for win32-g++, so we assume it is there." 291 + echo "We cannot test for system CFG_OPENSSL since we are cross building for win32-g++, so we assume it is there."
291 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 292 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
292 if [ "$CFG_OPENSSL" = "auto" ]; then 293 if [ "$CFG_OPENSSL" = "auto" ]; then
293 CFG_OPENSSL=yes 294 CFG_OPENSSL=yes
294 fi 295 fi
295 @@ -6141,6 +6217,7 @@ fi 296 @@ -6141,6 +6218,7 @@ fi
296 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" 297 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
297 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" 298 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
298 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" 299 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
299 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti" 300 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti"
300 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" 301 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
301 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" 302 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
302 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" 303 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
303 @@ -6222,11 +6299,12 @@ else 304 @@ -6222,11 +6300,12 @@ else
304 QT_CONFIG="$QT_CONFIG freetype" 305 QT_CONFIG="$QT_CONFIG freetype"
305 fi 306 fi
306 307
307 -if [ "x$PLATFORM_MAC" = "xyes" ]; then 308 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
308 - #On Mac we implicitly link against libz, so we 309 - #On Mac we implicitly link against libz, so we
316 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" 317 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
317 +#fi 318 +#fi
318 if [ "$CFG_ZLIB" = "yes" ]; then 319 if [ "$CFG_ZLIB" = "yes" ]; then
319 QT_CONFIG="$QT_CONFIG zlib" 320 QT_CONFIG="$QT_CONFIG zlib"
320 elif [ "$CFG_ZLIB" = "system" ]; then 321 elif [ "$CFG_ZLIB" = "system" ]; then
321 @@ -7161,7 +7239,7 @@ fi 322 @@ -7161,7 +7240,7 @@ fi
322 323
323 cat >>"$QTCONFIG.tmp" <<EOF 324 cat >>"$QTCONFIG.tmp" <<EOF
324 #configuration 325 #configuration
325 -CONFIG += $QTCONFIG_CONFIG 326 -CONFIG += $QTCONFIG_CONFIG
326 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG 327 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
327 QT_ARCH = $CFG_ARCH 328 QT_ARCH = $CFG_ARCH
328 QT_EDITION = $Edition 329 QT_EDITION = $Edition
329 QT_CONFIG += $QT_CONFIG 330 QT_CONFIG += $QT_CONFIG
330 @@ -7253,7 +7331,7 @@ fi 331 @@ -7434,7 +7513,7 @@ fi
331 if [ '!' -z "$OPENSSL_LIBS" ]; then
332 echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
333 elif [ "$CFG_OPENSSL" = "linked" ]; then
334 - echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
335 + echo "OPENSSL_LIBS = `$PKG_CONFIG --libs openssl`" >> "$CACHEFILE.tmp"
336 fi
337
338 #dump in the SDK info
339 @@ -7434,7 +7512,7 @@ fi
340 echo "Declarative module .. $CFG_DECLARATIVE" 332 echo "Declarative module .. $CFG_DECLARATIVE"
341 echo "STL support ......... $CFG_STL" 333 echo "STL support ......... $CFG_STL"
342 echo "PCH support ......... $CFG_PRECOMPILE" 334 echo "PCH support ......... $CFG_PRECOMPILE"
343 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}" 335 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
344 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}" 336 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
345 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then 337 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
346 echo "iWMMXt support ...... ${CFG_IWMMXT}" 338 echo "iWMMXt support ...... ${CFG_IWMMXT}"
347 echo "NEON support ........ ${CFG_NEON}" 339 echo "NEON support ........ ${CFG_NEON}"
348 @@ -7752,7 +7830,11 @@ for file in .projects .projects.3; do 340 @@ -7752,7 +7831,11 @@ for file in .projects .projects.3; do
349 [ "$IN_ROOT" = "no" ] && continue 341 [ "$IN_ROOT" = "no" ] && continue
350 342
351 case $a in 343 case $a in
352 - *winmain/winmain.pro) continue ;; 344 - *winmain/winmain.pro) continue ;;
353 + *winmain/winmain.pro) 345 + *winmain/winmain.pro)