summaryrefslogtreecommitdiff
path: root/mkspecs/win32-msvc
Side-by-side diff
Diffstat (limited to 'mkspecs/win32-msvc') (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/win32-msvc/qmake.conf37
-rw-r--r--mkspecs/win32-msvc/qplatformdefs.h4
-rw-r--r--mkspecs/win32-msvc/win32app.dsp12
-rw-r--r--mkspecs/win32-msvc/win32dll.dsp12
-rw-r--r--mkspecs/win32-msvc/win32lib.dsp10
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
@@ -3,3 +3,5 @@
#
-# qmake configuration for Win32/Microsoft C++
+# qmake configuration for win32-msvc
+#
+# Written for Microsoft C++.
#
@@ -8,3 +10,3 @@ 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
@@ -17,3 +19,3 @@ QMAKE_CC = cl
QMAKE_LEX = flex
-QMAKE_LEXFLAGS =
+QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
@@ -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$@ @<<
@@ -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-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
@@ -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
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
@@ -43,3 +43,3 @@ RSC=rc.exe
# 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
@@ -49,4 +49,4 @@ BSC32=bscmake.exe
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
@@ -64,3 +64,3 @@ $$MSVCDSP_REGSVR_REL
# 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
@@ -70,4 +70,4 @@ BSC32=bscmake.exe
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
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
@@ -44,3 +44,3 @@ RSC=rc.exe
# 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
@@ -50,4 +50,4 @@ BSC32=bscmake.exe
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
@@ -66,3 +66,3 @@ $$MSVCDSP_COPY_DLL_REL
# 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
@@ -72,4 +72,4 @@ BSC32=bscmake.exe
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
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
@@ -42,3 +42,3 @@ RSC=rc.exe
# 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"
@@ -47,3 +47,4 @@ BSC32=bscmake.exe
LIB32=link.exe -lib
-# ADD LIB32 /nologo $$MSVCDSP_TARGET
+# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_REL
@@ -61,3 +62,3 @@ LIB32=link.exe -lib
# 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"
@@ -66,3 +67,4 @@ BSC32=bscmake.exe
LIB32=link.exe -lib
-# ADD LIB32 /nologo $$MSVCDSP_TARGET
+# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_DBG