143 lines
5.4 KiB
Diff
143 lines
5.4 KiB
Diff
|
|
diff -urN qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc/qmake.conf qt-win-commercial-src-4.4.3/mkspecs/win32-msvc/qmake.conf
|
||
|
|
--- qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc/qmake.conf 2008-09-27 11:00:54.000000000 +0400
|
||
|
|
+++ qt-win-commercial-src-4.4.3/mkspecs/win32-msvc/qmake.conf 2008-10-02 13:48:10.000000000 +0400
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
QMAKE_CFLAGS = -nologo -Zm200
|
||
|
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||
|
|
QMAKE_CFLAGS_WARN_OFF = -W0
|
||
|
|
-QMAKE_CFLAGS_RELEASE = -O1 -MD
|
||
|
|
+QMAKE_CFLAGS_RELEASE = -O1 -MT
|
||
|
|
QMAKE_CFLAGS_DEBUG = -Zi -MDd
|
||
|
|
QMAKE_CFLAGS_YACC =
|
||
|
|
|
||
|
|
diff -urN qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc.net/qmake.conf qt-win-commercial-src-4.4.3/mkspecs/win32-msvc.net/qmake.conf
|
||
|
|
--- qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc.net/qmake.conf 2008-09-27 11:00:54.000000000 +0400
|
||
|
|
+++ qt-win-commercial-src-4.4.3/mkspecs/win32-msvc.net/qmake.conf 2008-10-02 13:48:00.000000000 +0400
|
||
|
|
@@ -20,7 +20,7 @@
|
||
|
|
QMAKE_CFLAGS = -nologo -Zm300
|
||
|
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||
|
|
QMAKE_CFLAGS_WARN_OFF = -W0
|
||
|
|
-QMAKE_CFLAGS_RELEASE = -O2 -MD
|
||
|
|
+QMAKE_CFLAGS_RELEASE = -O2 -MT
|
||
|
|
QMAKE_CFLAGS_DEBUG = -Zi -MDd
|
||
|
|
QMAKE_CFLAGS_YACC =
|
||
|
|
|
||
|
|
@@ -31,11 +31,11 @@
|
||
|
|
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||
|
|
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||
|
|
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||
|
|
-QMAKE_CXXFLAGS_STL_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_STL_ON =
|
||
|
|
QMAKE_CXXFLAGS_STL_OFF =
|
||
|
|
QMAKE_CXXFLAGS_RTTI_ON = -GR
|
||
|
|
QMAKE_CXXFLAGS_RTTI_OFF =
|
||
|
|
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_EXCEPTIONS_ON =
|
||
|
|
QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
|
||
|
|
|
||
|
|
QMAKE_INCDIR =
|
||
|
|
diff -urN qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2002/qmake.conf qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2002/qmake.conf
|
||
|
|
--- qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2002/qmake.conf 2008-09-27 11:00:54.000000000 +0400
|
||
|
|
+++ qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2002/qmake.conf 2008-10-02 13:47:51.000000000 +0400
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
QMAKE_CFLAGS = -nologo -Zm300
|
||
|
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||
|
|
QMAKE_CFLAGS_WARN_OFF = -W0
|
||
|
|
-QMAKE_CFLAGS_RELEASE = -O2 -MD
|
||
|
|
+QMAKE_CFLAGS_RELEASE = -O2 -MT
|
||
|
|
QMAKE_CFLAGS_DEBUG = -Zi -MDd
|
||
|
|
QMAKE_CFLAGS_YACC =
|
||
|
|
|
||
|
|
@@ -30,11 +30,11 @@
|
||
|
|
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||
|
|
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||
|
|
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||
|
|
-QMAKE_CXXFLAGS_STL_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_STL_ON =
|
||
|
|
QMAKE_CXXFLAGS_STL_OFF =
|
||
|
|
QMAKE_CXXFLAGS_RTTI_ON = -GR
|
||
|
|
QMAKE_CXXFLAGS_RTTI_OFF =
|
||
|
|
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_EXCEPTIONS_ON =
|
||
|
|
QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
|
||
|
|
|
||
|
|
QMAKE_INCDIR =
|
||
|
|
diff -urN qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2003/qmake.conf qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2003/qmake.conf
|
||
|
|
--- qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2003/qmake.conf 2008-09-27 11:00:54.000000000 +0400
|
||
|
|
+++ qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2003/qmake.conf 2008-10-02 13:47:41.000000000 +0400
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
QMAKE_CFLAGS = -nologo -Zm300
|
||
|
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||
|
|
QMAKE_CFLAGS_WARN_OFF = -W0
|
||
|
|
-QMAKE_CFLAGS_RELEASE = -O2 -MD
|
||
|
|
+QMAKE_CFLAGS_RELEASE = -O2 -MT
|
||
|
|
QMAKE_CFLAGS_DEBUG = -Zi -MDd
|
||
|
|
QMAKE_CFLAGS_YACC =
|
||
|
|
|
||
|
|
@@ -30,11 +30,11 @@
|
||
|
|
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||
|
|
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||
|
|
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||
|
|
-QMAKE_CXXFLAGS_STL_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_STL_ON =
|
||
|
|
QMAKE_CXXFLAGS_STL_OFF =
|
||
|
|
QMAKE_CXXFLAGS_RTTI_ON = -GR
|
||
|
|
QMAKE_CXXFLAGS_RTTI_OFF =
|
||
|
|
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_EXCEPTIONS_ON =
|
||
|
|
QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
|
||
|
|
|
||
|
|
QMAKE_INCDIR =
|
||
|
|
diff -urN qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2005/qmake.conf qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2005/qmake.conf
|
||
|
|
--- qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2005/qmake.conf 2008-09-27 11:00:54.000000000 +0400
|
||
|
|
+++ qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2005/qmake.conf 2008-10-02 13:47:32.000000000 +0400
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
|
||
|
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||
|
|
QMAKE_CFLAGS_WARN_OFF = -W0
|
||
|
|
-QMAKE_CFLAGS_RELEASE = -O2 -MD
|
||
|
|
+QMAKE_CFLAGS_RELEASE = -O2 -MT
|
||
|
|
QMAKE_CFLAGS_DEBUG = -Zi -MDd
|
||
|
|
QMAKE_CFLAGS_YACC =
|
||
|
|
|
||
|
|
@@ -30,11 +30,11 @@
|
||
|
|
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||
|
|
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||
|
|
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||
|
|
-QMAKE_CXXFLAGS_STL_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_STL_ON =
|
||
|
|
QMAKE_CXXFLAGS_STL_OFF =
|
||
|
|
QMAKE_CXXFLAGS_RTTI_ON = -GR
|
||
|
|
QMAKE_CXXFLAGS_RTTI_OFF =
|
||
|
|
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_EXCEPTIONS_ON =
|
||
|
|
QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
|
||
|
|
|
||
|
|
QMAKE_INCDIR =
|
||
|
|
diff -urN qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2008/qmake.conf qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2008/qmake.conf
|
||
|
|
--- qt-win-commercial-src-4.4.3.orig/mkspecs/win32-msvc2008/qmake.conf 2008-09-27 11:00:54.000000000 +0400
|
||
|
|
+++ qt-win-commercial-src-4.4.3/mkspecs/win32-msvc2008/qmake.conf 2008-10-02 13:47:23.000000000 +0400
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
|
||
|
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||
|
|
QMAKE_CFLAGS_WARN_OFF = -W0
|
||
|
|
-QMAKE_CFLAGS_RELEASE = -O2 -MD
|
||
|
|
+QMAKE_CFLAGS_RELEASE = -O2 -MT
|
||
|
|
QMAKE_CFLAGS_DEBUG = -Zi -MDd
|
||
|
|
QMAKE_CFLAGS_YACC =
|
||
|
|
|
||
|
|
@@ -30,11 +30,11 @@
|
||
|
|
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||
|
|
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||
|
|
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||
|
|
-QMAKE_CXXFLAGS_STL_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_STL_ON =
|
||
|
|
QMAKE_CXXFLAGS_STL_OFF =
|
||
|
|
QMAKE_CXXFLAGS_RTTI_ON = -GR
|
||
|
|
QMAKE_CXXFLAGS_RTTI_OFF =
|
||
|
|
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
|
||
|
|
+QMAKE_CXXFLAGS_EXCEPTIONS_ON =
|
||
|
|
QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
|
||
|
|
|
||
|
|
QMAKE_INCDIR =
|