Mercurial > mxe-octave

comparison src/qt-win32.patch @ 524:28e14850b092

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements for package qt (by Mark Brand) Added support for compiler flag rtti to configure script. This was already supported by the configure binary for Windows. Fixed "detection" of mmx, 3dnow, sse, sse2, and rtti in configure script for win32-g++ target. Fixed failure to add a whole bunch of CONFIG options to qconfig.pri, including but not limited to mmx, 3dnow, sse, sse2. I wonder if this was a bug in the configure script. Now the CONFIG line looks more like the one produced by the configure binary.
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 08 Nov 2009 22:43:41 +0100
parents 9294e8fad5e9
children 08b6c299a522
comparison
equal deleted inserted replaced
523:1711ff2b9416 524:28e14850b092
19 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 19 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 20 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23 23
24 --- qt-everywhere-opensource-src-4.6.0-beta1.native/configure 2009-10-28 00:04:38.000000000 +0100 24 --- qt-everywhere-opensource-src-4.6.0-beta1.native/configure 2009-10-29 14:02:18.000000000 +0100
25 +++ qt-everywhere-opensource-src-4.6.0-beta1/configure 2009-10-28 00:13:15.000000000 +0100 25 +++ qt-everywhere-opensource-src-4.6.0-beta1/configure 2009-10-29 14:00:46.000000000 +0100
26 @@ -600,7 +600,7 @@ 26 @@ -600,7 +600,7 @@
27 rm -f "$outpath/config.tests/.qmake.cache" 27 rm -f "$outpath/config.tests/.qmake.cache"
28 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" 28 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
29 29
30 -QMakeVar add styles "cde mac motif plastique cleanlooks windows" 30 -QMakeVar add styles "cde mac motif plastique cleanlooks windows"
31 +QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista" 31 +QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista"
32 QMakeVar add decorations "default windows styled" 32 QMakeVar add decorations "default windows styled"
33 QMakeVar add mouse-drivers "pc" 33 QMakeVar add mouse-drivers "pc"
34 if [ "$UNAME_SYSTEM" = "Linux" ] ; then 34 if [ "$UNAME_SYSTEM" = "Linux" ] ; then
35 @@ -4598,7 +4598,10 @@ 35 @@ -725,6 +725,7 @@
36 CFG_3DNOW=auto
37 CFG_SSE=auto
38 CFG_SSE2=auto
39 +CFG_RTTI=auto
40 CFG_REDUCE_RELOCATIONS=no
41 CFG_IPV6=auto
42 CFG_NAS=no
43 @@ -4374,7 +4375,10 @@
44
45 # detect mmx support
46 if [ "${CFG_MMX}" = "auto" ]; then
47 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
48 + if [ "$XPLATFORM" = "win32-g++" ]; then
49 + echo "Using MMX for win32-g++ target"
50 + CFG_MMX=yes
51 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
52 CFG_MMX=yes
53 else
54 CFG_MMX=no
55 @@ -4383,7 +4387,10 @@
56
57 # detect 3dnow support
58 if [ "${CFG_3DNOW}" = "auto" ]; then
59 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
60 + if [ "$XPLATFORM" = "win32-g++" ]; then
61 + echo "Using SSE for win32-g++ target"
62 + CFG_3DNOW=yes
63 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
64 CFG_3DNOW=yes
65 else
66 CFG_3DNOW=no
67 @@ -4392,7 +4399,10 @@
68
69 # detect sse support
70 if [ "${CFG_SSE}" = "auto" ]; then
71 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
72 + if [ "$XPLATFORM" = "win32-g++" ]; then
73 + echo "Using SSE for win32-g++ target"
74 + CFG_SSE=yes
75 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
76 CFG_SSE=yes
77 else
78 CFG_SSE=no
79 @@ -4401,13 +4411,26 @@
80
81 # detect sse2 support
82 if [ "${CFG_SSE2}" = "auto" ]; then
83 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
84 + if [ "$XPLATFORM" = "win32-g++" ]; then
85 + echo "Using SSE2 for win32-g++ target"
86 + CFG_SSE2=yes
87 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
88 CFG_SSE2=yes
89 else
90 CFG_SSE2=no
91 fi
92 fi
93
94 +# detect rtti support
95 +if [ "${CFG_RTTI}" = "auto" ]; then
96 + if [ "$XPLATFORM" = "win32-g++" ]; then
97 + echo "Using RTTI for win32-g++ target"
98 + CFG_RTTI=yes
99 + else
100 + CFG_RTTI=no
101 + fi
102 +fi
103 +
104 # check iWMMXt support
105 if [ "$CFG_IWMMXT" = "yes" ]; then
106 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
107 @@ -4598,7 +4621,10 @@
36 ;; 108 ;;
37 odbc) 109 odbc)
38 if [ "$CFG_SQL_odbc" != "no" ]; then 110 if [ "$CFG_SQL_odbc" != "no" ]; then
39 - 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 111 - 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
40 + if [ "$XPLATFORM" = "win32-g++" ]; then 112 + if [ "$XPLATFORM" = "win32-g++" ]; then
42 + CFG_SQL_odbc=plugin 114 + CFG_SQL_odbc=plugin
43 + 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 115 + 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
44 if [ "$CFG_SQL_odbc" = "auto" ]; then 116 if [ "$CFG_SQL_odbc" = "auto" ]; then
45 CFG_SQL_odbc=plugin 117 CFG_SQL_odbc=plugin
46 fi 118 fi
47 @@ -4956,7 +4959,9 @@ 119 @@ -4956,7 +4982,9 @@
48 echo "Basic XLib functionality test failed!" 120 echo "Basic XLib functionality test failed!"
49 echo " You might need to modify the include and library search paths by editing" 121 echo " You might need to modify the include and library search paths by editing"
50 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." 122 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
51 - exit 1 123 - exit 1
52 +echo NOTICE: This is a specially modifed configure script! 124 +echo NOTICE: This is a specially modifed configure script!
53 +echo For our purposes we do not want X11. 125 +echo For our purposes we do not want X11.
54 +# exit 1 126 +# exit 1
55 fi 127 fi
56 128
57 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) 129 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
58 @@ -5030,7 +5035,9 @@ 130 @@ -5030,7 +5058,9 @@
59 echo " You might need to modify the include and library search paths by editing" 131 echo " You might need to modify the include and library search paths by editing"
60 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" 132 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
61 echo " ${XQMAKESPEC}." 133 echo " ${XQMAKESPEC}."
62 - exit 1 134 - exit 1
63 +echo NOTICE: This is a specially modifed configure script! 135 +echo NOTICE: This is a specially modifed configure script!
64 +echo For our purposes we do not want the OpenGL functionality test. 136 +echo For our purposes we do not want the OpenGL functionality test.
65 +# exit 1 137 +# exit 1
66 fi 138 fi
67 case "$PLATFORM" in 139 case "$PLATFORM" in
68 hpux*) 140 hpux*)
69 @@ -6096,11 +6103,12 @@ 141 @@ -6016,6 +6046,7 @@
142 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
143 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
144 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
145 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti"
146 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
147 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
148 if [ "$CFG_IPV6" = "yes" ]; then
149 @@ -6096,11 +6127,12 @@
70 QT_CONFIG="$QT_CONFIG freetype" 150 QT_CONFIG="$QT_CONFIG freetype"
71 fi 151 fi
72 152
73 -if [ "x$PLATFORM_MAC" = "xyes" ]; then 153 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
74 - #On Mac we implicitly link against libz, so we 154 - #On Mac we implicitly link against libz, so we
82 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" 162 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
83 +#fi 163 +#fi
84 if [ "$CFG_ZLIB" = "yes" ]; then 164 if [ "$CFG_ZLIB" = "yes" ]; then
85 QT_CONFIG="$QT_CONFIG zlib" 165 QT_CONFIG="$QT_CONFIG zlib"
86 elif [ "$CFG_ZLIB" = "system" ]; then 166 elif [ "$CFG_ZLIB" = "system" ]; then
87 @@ -7610,7 +7618,11 @@ 167 @@ -7025,7 +7057,7 @@
168
169 cat >>"$QTCONFIG.tmp" <<EOF
170 #configuration
171 -CONFIG += $QTCONFIG_CONFIG
172 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
173 QT_ARCH = $CFG_ARCH
174 QT_EDITION = $Edition
175 QT_CONFIG += $QT_CONFIG
176 @@ -7297,7 +7329,7 @@
177 fi
178 echo "STL support ......... $CFG_STL"
179 echo "PCH support ......... $CFG_PRECOMPILE"
180 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
181 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
182 if [ "${CFG_ARCH}" = "arm" ]; then
183 echo "iWMMXt support ...... ${CFG_IWMMXT}"
184 fi
185 @@ -7610,7 +7642,11 @@
88 [ "$IN_ROOT" = "no" ] && continue 186 [ "$IN_ROOT" = "no" ] && continue
89 187
90 case $a in 188 case $a in
91 - *winmain/winmain.pro) continue ;; 189 - *winmain/winmain.pro) continue ;;
92 + *winmain/winmain.pro) 190 + *winmain/winmain.pro)