1 files changed, 26 insertions, 19 deletions

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index f7b43b9..088c7f5 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -2,10 +2,12 @@
 # $Id$
 #
-# qmake configuration for Win32/Intel C++
+# qmake configuration for win32-icc
+#
+# Written for Intel C++ 5.0.1, 6.0.1, and 7.0 for Windows.
 #
 
         MAKEFILE_GENERATOR= MSVC
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental
+        CONFIG          += qt warn_on release incremental link_prl
         DEFINES                 += UNICODE
 
@@ -22,6 +24,6 @@ QMAKE_CFLAGS		= -nologo -Zm200 $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -W3
         QMAKE_CFLAGS_WARN_OFF= -W0
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Od -Ob1s)
-        QMAKE_CFLAGS_DEBUG= -Zi
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), )
+        QMAKE_CFLAGS_DEBUG= -Zi -Od
         QMAKE_CFLAGS_MT         = -MD
         QMAKE_CFLAGS_MT_DBG= -MDd
@@ -29,14 +31,10 @@ 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
@@ -51,5 +49,10 @@ 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    =
@@ -59,6 +62,8 @@ 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
@@ -75,7 +80,7 @@ QMAKE_LIBS		= $(LIBS_EXTRA)
         QMAKE_LIBS_CONSOLE=
         QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
-        QMAKE_LIBS_QT   = $(QTDIR)\lib\qt.lib
-        QMAKE_LIBS_QT_THREAD= $(QTDIR)\lib\qt-mt.lib
-        QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib
+        QMAKE_LIBS_QT   = qt.lib
+        QMAKE_LIBS_QT_THREAD= qt-mt.lib
+        QMAKE_LIBS_QT_ENTRY= qtmain.lib
 
         QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib
@@ -95,5 +100,7 @@ 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