1 files changed, 22 insertions, 15 deletions

diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf
index 6175be3..2d0c6da 100644
--- a/mkspecs/win32-msvc/qmake.conf
+++ b/mkspecs/win32-msvc/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# qmake configuration for Win32/Microsoft C++
+# qmake configuration for win32-msvc
+#
+# Written for Microsoft C++.
 #
 
         MAKEFILE_GENERATOR= MSVC
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental flat
+        CONFIG          += qt warn_on release incremental flat link_prl precompile_header
         DEFINES                 += UNICODE
 
 exists( $(QTDIR)\.qtwinconfig ) {
@@ -15,7 +17,7 @@ exists( $(QTDIR)\.qtwinconfig ) {
 
         QMAKE_CC        = cl
         QMAKE_LEX       = flex
-        QMAKE_LEXFLAGS  = 
+        QMAKE_LEXFLAGS  =
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -nologo -Zm200 $(CFLAGS_EXTRA)
@@ -28,16 +30,12 @@ QMAKE_CFLAGS_MT_DBG	= -MDd
         QMAKE_CFLAGS_MT_DLL= -MD
         QMAKE_CFLAGS_MT_DLLDBG= -MDd
         QMAKE_CFLAGS_YACC=
-
-contains(CONFIG,stl){
-                QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA)
-}
-contains(CONFIG,exceptions){
-        QMAKE_CFLAGS += -GX
-}
-contains(CONFIG,rtti){
-                QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA)
-}
+        QMAKE_CFLAGS_STL_ON= -GX
+        QMAKE_CFLAGS_STL_OFF=
+        QMAKE_CFLAGS_RTTI_ON= -GR
+        QMAKE_CFLAGS_RTTI_OFF=
+QMAKE_CFLAGS_EXCEPTIONS_ON = -GX
+QMAKE_CFLAGS_EXCEPTIONS_OFF =
 
         QMAKE_CXX       = $$QMAKE_CC
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
@@ -50,7 +48,12 @@ QMAKE_CXXFLAGS_MT_DBG	= $$QMAKE_CFLAGS_MT_DBG
         QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
-        QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL
+        QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON
+        QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF
+        QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON
+        QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF
+QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
 
         QMAKE_INCDIR    =
         QMAKE_INCDIR_QT         = $(QTDIR)\include
@@ -58,8 +61,10 @@ QMAKE_LIBDIR_QT		= $(QTDIR)\lib
 
         QMAKE_RUN_CC    = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
         QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
+        QMAKE_RUN_CC_IMP_BATCH= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<<
         QMAKE_RUN_CXX   = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
         QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
+        QMAKE_RUN_CXX_IMP_BATCH= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 
         QMAKE_LINK      = link
         QMAKE_LFLAGS    = /NOLOGO $(LFLAGS_EXTRA)
@@ -94,6 +99,8 @@ QMAKE_ZIP		= zip -r -9
         QMAKE_COPY      = copy
         QMAKE_MOVE      = move
         QMAKE_DEL_FILE  = del
-        QMAKE_DEL_DIR   = deltree
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= if not exist
+        QMAKE_MKDIR     = mkdir
 
         DSP_EXTENSION   = .dsp