summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorAndy Shaw <qt-info@nokia.com>2010-09-06 08:26:03 (GMT)
committerAndy Shaw <qt-info@nokia.com>2010-09-06 08:26:03 (GMT)
commit342dd15d61b56f97714a5d483454397e2c978c97 (patch)
treeea8c5518a354076e6eefa7440372b5ec835f89ba /qmake
parent91b1eff723c47fbe12d406a27053eea7d6c4a812 (diff)
downloadQt-342dd15d61b56f97714a5d483454397e2c978c97.zip
Qt-342dd15d61b56f97714a5d483454397e2c978c97.tar.gz
Qt-342dd15d61b56f97714a5d483454397e2c978c97.tar.bz2
Fix compilation of qmake with MSVC
Reviewed-by: TrustMe
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.win325
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 4565c22..354a73f 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -23,13 +23,14 @@ LINK = link
# specific stuff for VS2005
#
!if "$(QMAKESPEC)" == "win32-msvc2005"
-CFLAGS = /Zc:wchar_t-
+CFLAGS_EXTRA = /Zc:wchar_t-
!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010"
-CFLAGS = /MP
+CFLAGS_EXTRA = /MP
!endif
CFLAGS_BARE = -c -Fo./ \
-W3 -nologo -O2 \
+ $(CFLAGS_EXTRA) \
-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
-I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
-I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \