-CHECK if DIR exist added to qmake.conf's

-use arm-linux-g++ for linking now

hopefully not removed anything important

Added python tool to opiefy mkspecs

2 files changed, 30 insertions, 21 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
@@ -3,3 +3,5 @@
 #
-# 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.
 #
@@ -8,3 +10,3 @@ MAKEFILE_GENERATOR	= MSVC
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental
+        CONFIG          += qt warn_on release incremental link_prl
         DEFINES                 += UNICODE
@@ -23,4 +25,4 @@ 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
@@ -30,12 +32,8 @@ 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 =
 
@@ -52,3 +50,8 @@ 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
 
@@ -60,4 +63,6 @@ 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$@ @<<
 
@@ -76,5 +81,5 @@ 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
 
@@ -96,3 +101,5 @@ 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
 
diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h
index 1d72e8a..d828db8 100644
--- a/mkspecs/win32-icc/qplatformdefs.h
+++ b/mkspecs/win32-icc/qplatformdefs.h
@@ -28,3 +28,3 @@
 #define Q_FS_FAT
-#ifdef QT_LARGE_FILE_SUPPORT
+#ifdef QT_LARGEFILE_SUPPORT
         #define QT_STATBUF              struct _stati64         // non-ANSI defs
@@ -48,3 +48,3 @@
         #define QT_CLOSE        ::_close
-#ifdef QT_LARGE_FILE_SUPPORT
+#ifdef QT_LARGEFILE_SUPPORT
         #define QT_LSEEK        ::_lseeki64
@@ -83,2 +83,4 @@
 
+typedef int mode_t;
+