-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

5 files changed, 42 insertions, 33 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
diff --git a/mkspecs/win32-msvc/qplatformdefs.h b/mkspecs/win32-msvc/qplatformdefs.h
index 76ed8af..d828db8 100644
--- a/mkspecs/win32-msvc/qplatformdefs.h
+++ b/mkspecs/win32-msvc/qplatformdefs.h
@@ -26,7 +26,7 @@
 #include <windows.h>
 
 #define Q_FS_FAT
-#ifdef QT_LARGE_FILE_SUPPORT
+#ifdef QT_LARGEFILE_SUPPORT
 #define QT_STATBUF		struct _stati64		// non-ANSI defs
 #define QT_STATBUF4TSTAT	struct _stati64		// non-ANSI defs
 #define QT_STAT			::_stati64
@@ -46,7 +46,7 @@
 #define QT_FILENO		_fileno
 #define QT_OPEN			::_open
 #define QT_CLOSE		::_close
-#ifdef QT_LARGE_FILE_SUPPORT
+#ifdef QT_LARGEFILE_SUPPORT
 #define QT_LSEEK		::_lseeki64
 #define QT_TSTAT		::_tstati64
 #else
diff --git a/mkspecs/win32-msvc/win32app.dsp b/mkspecs/win32-msvc/win32app.dsp
index d09aa86..61d6a4a 100644
--- a/mkspecs/win32-msvc/win32app.dsp
+++ b/mkspecs/win32-msvc/win32app.dsp
@@ -41,14 +41,14 @@ RSC=rc.exe
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE
+# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE
-$$MSVCDSP_REGSVR_REL
+# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_REL
 
 !ELSEIF  "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
 
@@ -62,14 +62,14 @@ $$MSVCDSP_REGSVR_REL
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG
+# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG  $$PRECOMPILED_FLAGS_DEB
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG
-$$MSVCDSP_REGSVR_DBG
+# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_DBG
 
 !ENDIF 
 
diff --git a/mkspecs/win32-msvc/win32dll.dsp b/mkspecs/win32-msvc/win32dll.dsp
index 78b68d5..c619db4 100644
--- a/mkspecs/win32-msvc/win32dll.dsp
+++ b/mkspecs/win32-msvc/win32dll.dsp
@@ -42,14 +42,14 @@ RSC=rc.exe
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE
+# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE  $$PRECOMPILED_FLAGS_REL
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE
-$$MSVCDSP_COPY_DLL_REL
+# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_REL
 
 !ELSEIF  "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
 
@@ -64,14 +64,14 @@ $$MSVCDSP_COPY_DLL_REL
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG
+# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG  $$PRECOMPILED_FLAGS_DEB
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG
-$$MSVCDSP_COPY_DLL_DBG
+# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_DBG
 
 !ENDIF 
 
diff --git a/mkspecs/win32-msvc/win32lib.dsp b/mkspecs/win32-msvc/win32lib.dsp
index 70263c0..81d9f5a 100644
--- a/mkspecs/win32-msvc/win32lib.dsp
+++ b/mkspecs/win32-msvc/win32lib.dsp
@@ -40,12 +40,13 @@ RSC=rc.exe
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE
+# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_LIB" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD LIB32 /nologo $$MSVCDSP_TARGET
+# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_REL
 
 !ELSEIF  "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
 
@@ -59,12 +60,13 @@ LIB32=link.exe -lib
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS  $$QMAKE_CXXFLAGS_DEBUG
+# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS  $$QMAKE_CXXFLAGS_DEBUG  $$PRECOMPILED_FLAGS_DEB
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD LIB32 /nologo $$MSVCDSP_TARGET
+# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_DBG
 
 !ENDIF