Mercurial > mxe-octave

comparison src/qt-1-win32.patch @ 1002:92bbc989fb89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix configure script so "windows" is not a Mac architecture in package qt
author Mark Brand <mabrand@mabrand.nl>
date Fri, 21 May 2010 09:41:30 +0200
parents 37e7bea19863
children 7997c04d4bef
comparison
equal deleted inserted replaced
1001:4b94e4708014 1002:92bbc989fb89
182 CONFIG -= qt 182 CONFIG -= qt
183 -LIBS += -lGL -lGLU 183 -LIBS += -lGL -lGLU
184 +win32-g++:LIBS += -lopengl32 184 +win32-g++:LIBS += -lopengl32
185 +else:LIBS += -lGL -lGLU 185 +else:LIBS += -lGL -lGLU
186 diff --git a/configure b/configure 186 diff --git a/configure b/configure
187 index ed5891f..2a43afa 100755 187 index ed5891f..646cb73 100755
188 --- a/configure 188 --- a/configure
189 +++ b/configure 189 +++ b/configure
190 @@ -178,6 +178,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown 190 @@ -178,6 +178,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
191 # window system detection 191 # window system detection
192 #------------------------------------------------------------------------------- 192 #-------------------------------------------------------------------------------
210 CFG_SSE2=auto 210 CFG_SSE2=auto
211 +CFG_RTTI=auto 211 +CFG_RTTI=auto
212 CFG_REDUCE_RELOCATIONS=no 212 CFG_REDUCE_RELOCATIONS=no
213 CFG_IPV6=auto 213 CFG_IPV6=auto
214 CFG_NAS=no 214 CFG_NAS=no
215 @@ -1602,6 +1604,13 @@ while [ "$#" -gt 0 ]; do 215 @@ -1304,7 +1306,9 @@ while [ "$#" -gt 0 ]; do
216 fi
217 ;;
218 arch)
219 - if [ "$PLATFORM_MAC" = "yes" ]; then
220 + # if this is a Mac then "windows" probably means
221 + # we are cross-compiling for MinGW
222 + if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" != "windows" ]; then
223 CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL"
224 else
225 CFG_ARCH=$VAL
226 @@ -1602,6 +1606,13 @@ while [ "$#" -gt 0 ]; do
216 UNKNOWN_OPT=yes 227 UNKNOWN_OPT=yes
217 fi 228 fi
218 ;; 229 ;;
219 + rtti) 230 + rtti)
220 + if [ "$VAL" = "no" ]; then 231 + if [ "$VAL" = "no" ]; then
224 + fi 235 + fi
225 + ;; 236 + ;;
226 iwmmxt) 237 iwmmxt)
227 CFG_IWMMXT="yes" 238 CFG_IWMMXT="yes"
228 ;; 239 ;;
229 @@ -2827,6 +2836,9 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then 240 @@ -2827,6 +2838,9 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
230 CFG_ARCH=$CFG_HOST_ARCH 241 CFG_ARCH=$CFG_HOST_ARCH
231 fi 242 fi
232 243
233 +# but windows is windows 244 +# but windows is windows
234 +[ "$XPLATFORM" = "win32-g++" ] && CFG_ARCH="windows" 245 +[ "$XPLATFORM" = "win32-g++" ] && CFG_ARCH="windows"
235 + 246 +
236 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then 247 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
237 if [ "$OPT_VERBOSE" = "yes" ]; then 248 if [ "$OPT_VERBOSE" = "yes" ]; then
238 echo " '$CFG_ARCH' is supported" 249 echo " '$CFG_ARCH' is supported"
239 @@ -3482,6 +3494,7 @@ cat << EOF 250 @@ -3482,6 +3496,7 @@ cat << EOF
240 -no-3dnow .......... Do not compile with use of 3DNOW instructions. 251 -no-3dnow .......... Do not compile with use of 3DNOW instructions.
241 -no-sse ............ Do not compile with use of SSE instructions. 252 -no-sse ............ Do not compile with use of SSE instructions.
242 -no-sse2 ........... Do not compile with use of SSE2 instructions. 253 -no-sse2 ........... Do not compile with use of SSE2 instructions.
243 + -no-rtti ........... Do not compile with RTTI. 254 + -no-rtti ........... Do not compile with RTTI.
244 255
245 -qtnamespace <name> Wraps all Qt library code in 'namespace <name> {...}'. 256 -qtnamespace <name> Wraps all Qt library code in 'namespace <name> {...}'.
246 -qtlibinfix <infix> Renames all libQt*.so to libQt*<infix>.so. 257 -qtlibinfix <infix> Renames all libQt*.so to libQt*<infix>.so.
247 @@ -4508,6 +4521,17 @@ if [ "${CFG_SSE2}" = "auto" ]; then 258 @@ -4508,6 +4523,17 @@ if [ "${CFG_SSE2}" = "auto" ]; then
248 fi 259 fi
249 fi 260 fi
250 261
251 +# detect rtti support 262 +# detect rtti support
252 +if [ "${CFG_RTTI}" = "auto" ]; then 263 +if [ "${CFG_RTTI}" = "auto" ]; then
260 +fi 271 +fi
261 + 272 +
262 # check iWMMXt support 273 # check iWMMXt support
263 if [ "$CFG_IWMMXT" = "yes" ]; then 274 if [ "$CFG_IWMMXT" = "yes" ]; then
264 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt" 275 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
265 @@ -4683,6 +4707,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 276 @@ -4683,6 +4709,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
266 if "$WHICH" pg_config >/dev/null 2>&1; then 277 if "$WHICH" pg_config >/dev/null 2>&1; then
267 QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` 278 QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
268 QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` 279 QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
269 + QT_LFLAGS_PSQL="$QT_LFLAGS_PSQL $PSQL_LIBS" 280 + QT_LFLAGS_PSQL="$QT_LFLAGS_PSQL $PSQL_LIBS"
270 fi 281 fi
271 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" 282 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
272 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" 283 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
273 @@ -4707,7 +4732,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 284 @@ -4707,7 +4734,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
274 ;; 285 ;;
275 odbc) 286 odbc)
276 if [ "$CFG_SQL_odbc" != "no" ]; then 287 if [ "$CFG_SQL_odbc" != "no" ]; then
277 - 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 288 - 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
278 + if [ "$PLATFORM_MAC" != "yes" ] || [ "$XPLATFORM" = "win32-g++" ] && "$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 289 + if [ "$PLATFORM_MAC" != "yes" ] || [ "$XPLATFORM" = "win32-g++" ] && "$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
279 if [ "$CFG_SQL_odbc" = "auto" ]; then 290 if [ "$CFG_SQL_odbc" = "auto" ]; then
280 CFG_SQL_odbc=plugin 291 CFG_SQL_odbc=plugin
281 fi 292 fi
282 @@ -5002,7 +5027,10 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then 293 @@ -5002,7 +5029,10 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
283 fi 294 fi
284 295
285 if [ "$CFG_PHONON" != "no" ]; then 296 if [ "$CFG_PHONON" != "no" ]; then
286 - if [ "$CFG_PHONON_BACKEND" != "no" ]; then 297 - if [ "$CFG_PHONON_BACKEND" != "no" ]; then
287 + if [ "$XPLATFORM" = "win32-g++" ]; then 298 + if [ "$XPLATFORM" = "win32-g++" ]; then
289 + CFG_PHONON=yes 300 + CFG_PHONON=yes
290 + elif [ "$CFG_PHONON_BACKEND" != "no" ]; then 301 + elif [ "$CFG_PHONON_BACKEND" != "no" ]; then
291 if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then 302 if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
292 if [ -n "$PKG_CONFIG" ]; then 303 if [ -n "$PKG_CONFIG" ]; then
293 QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` 304 QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
294 @@ -5060,8 +5088,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then 305 @@ -5060,8 +5090,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
295 fi 306 fi
296 307
297 # Check we actually have X11 :-) 308 # Check we actually have X11 :-)
298 - "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS 309 - "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
299 - if [ $? != "0" ]; then 310 - if [ $? != "0" ]; then
301 + echo "Skipping XLib test for win32-g++" 312 + echo "Skipping XLib test for win32-g++"
302 + elif ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then 313 + elif ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
303 echo "Basic XLib functionality test failed!" 314 echo "Basic XLib functionality test failed!"
304 echo " You might need to modify the include and library search paths by editing" 315 echo " You might need to modify the include and library search paths by editing"
305 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." 316 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
306 @@ -6141,6 +6170,7 @@ fi 317 @@ -6141,6 +6172,7 @@ fi
307 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" 318 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
308 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" 319 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
309 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" 320 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
310 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti" 321 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti"
311 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" 322 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
312 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" 323 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
313 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" 324 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
314 @@ -6222,7 +6252,7 @@ else 325 @@ -6222,7 +6254,7 @@ else
315 QT_CONFIG="$QT_CONFIG freetype" 326 QT_CONFIG="$QT_CONFIG freetype"
316 fi 327 fi
317 328
318 -if [ "x$PLATFORM_MAC" = "xyes" ]; then 329 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
319 +if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then 330 +if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then
320 #On Mac we implicitly link against libz, so we 331 #On Mac we implicitly link against libz, so we
321 #never use the 3rdparty stuff. 332 #never use the 3rdparty stuff.
322 [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" 333 [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
323 @@ -7161,7 +7191,7 @@ fi 334 @@ -7161,7 +7193,7 @@ fi
324 335
325 cat >>"$QTCONFIG.tmp" <<EOF 336 cat >>"$QTCONFIG.tmp" <<EOF
326 #configuration 337 #configuration
327 -CONFIG += $QTCONFIG_CONFIG 338 -CONFIG += $QTCONFIG_CONFIG
328 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG 339 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
329 QT_ARCH = $CFG_ARCH 340 QT_ARCH = $CFG_ARCH
330 QT_EDITION = $Edition 341 QT_EDITION = $Edition
331 QT_CONFIG += $QT_CONFIG 342 QT_CONFIG += $QT_CONFIG
332 @@ -7434,7 +7464,7 @@ fi 343 @@ -7434,7 +7466,7 @@ fi
333 echo "Declarative module .. $CFG_DECLARATIVE" 344 echo "Declarative module .. $CFG_DECLARATIVE"
334 echo "STL support ......... $CFG_STL" 345 echo "STL support ......... $CFG_STL"
335 echo "PCH support ......... $CFG_PRECOMPILE" 346 echo "PCH support ......... $CFG_PRECOMPILE"
336 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}" 347 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
337 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}" 348 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
338 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then 349 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
339 echo "iWMMXt support ...... ${CFG_IWMMXT}" 350 echo "iWMMXt support ...... ${CFG_IWMMXT}"
340 echo "NEON support ........ ${CFG_NEON}" 351 echo "NEON support ........ ${CFG_NEON}"
341 @@ -7752,7 +7782,11 @@ for file in .projects .projects.3; do 352 @@ -7752,7 +7784,11 @@ for file in .projects .projects.3; do
342 [ "$IN_ROOT" = "no" ] && continue 353 [ "$IN_ROOT" = "no" ] && continue
343 354
344 case $a in 355 case $a in
345 - *winmain/winmain.pro) continue ;; 356 - *winmain/winmain.pro) continue ;;
346 + *winmain/winmain.pro) 357 + *winmain/winmain.pro)