summaryrefslogtreecommitdiff
path: root/mkspecs/win32-msvc
Unidiff
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 @@
3# 3#
4# qmake configuration for Win32/Microsoft C++ 4# qmake configuration for win32-msvc
5#
6# Written for Microsoft C++.
5# 7#
@@ -8,3 +10,3 @@ MAKEFILE_GENERATOR = MSVC
8 TEMPLATE = app 10 TEMPLATE = app
9 CONFIG += qt warn_on release incremental flat 11 CONFIG += qt warn_on release incremental flat link_prl precompile_header
10 DEFINES += UNICODE 12 DEFINES += UNICODE
@@ -17,3 +19,3 @@ QMAKE_CC = cl
17 QMAKE_LEX = flex 19 QMAKE_LEX = flex
18 QMAKE_LEXFLAGS = 20 QMAKE_LEXFLAGS =
19 QMAKE_YACC = byacc 21 QMAKE_YACC = byacc
@@ -30,12 +32,8 @@ QMAKE_CFLAGS_MT_DLLDBG = -MDd
30 QMAKE_CFLAGS_YACC= 32 QMAKE_CFLAGS_YACC=
31 33 QMAKE_CFLAGS_STL_ON= -GX
32contains(CONFIG,stl){ 34 QMAKE_CFLAGS_STL_OFF=
33 QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) 35 QMAKE_CFLAGS_RTTI_ON= -GR
34} 36 QMAKE_CFLAGS_RTTI_OFF=
35contains(CONFIG,exceptions){ 37QMAKE_CFLAGS_EXCEPTIONS_ON = -GX
36 QMAKE_CFLAGS += -GX 38QMAKE_CFLAGS_EXCEPTIONS_OFF =
37}
38contains(CONFIG,rtti){
39 QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA)
40}
41 39
@@ -52,3 +50,8 @@ QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
52 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC 50 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
53 QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL 51 QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON
52 QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF
53 QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON
54 QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF
55QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON
56QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
54 57
@@ -60,4 +63,6 @@ QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
60 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< 63 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
64 QMAKE_RUN_CC_IMP_BATCH= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<<
61 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src 65 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
62 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< 66 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
67 QMAKE_RUN_CXX_IMP_BATCH= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
63 68
@@ -96,3 +101,5 @@ QMAKE_MOVE = move
96 QMAKE_DEL_FILE = del 101 QMAKE_DEL_FILE = del
97 QMAKE_DEL_DIR = deltree 102 QMAKE_DEL_DIR = rmdir
103 QMAKE_CHK_DIR_EXISTS= if not exist
104 QMAKE_MKDIR = mkdir
98 105
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 @@
28#define Q_FS_FAT 28#define Q_FS_FAT
29#ifdef QT_LARGE_FILE_SUPPORT 29#ifdef QT_LARGEFILE_SUPPORT
30 #define QT_STATBUF struct _stati64 // non-ANSI defs 30 #define QT_STATBUF struct _stati64 // non-ANSI defs
@@ -48,3 +48,3 @@
48 #define QT_CLOSE ::_close 48 #define QT_CLOSE ::_close
49#ifdef QT_LARGE_FILE_SUPPORT 49#ifdef QT_LARGEFILE_SUPPORT
50 #define QT_LSEEK ::_lseeki64 50 #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
43# PROP Target_Dir "" 43# PROP Target_Dir ""
44# 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 44# 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
45# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 45# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -49,4 +49,4 @@ BSC32=bscmake.exe
49LINK32=link.exe 49LINK32=link.exe
50# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE 50# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT
51$$MSVCDSP_REGSVR_REL 51$$MSVCDSP_POST_LINK_REL
52 52
@@ -64,3 +64,3 @@ $$MSVCDSP_REGSVR_REL
64# PROP Target_Dir "" 64# PROP Target_Dir ""
65# 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 65# 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
66# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 66# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -70,4 +70,4 @@ BSC32=bscmake.exe
70LINK32=link.exe 70LINK32=link.exe
71# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG 71# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT
72$$MSVCDSP_REGSVR_DBG 72$$MSVCDSP_POST_LINK_DBG
73 73
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
44# PROP Target_Dir "" 44# PROP Target_Dir ""
45# 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 45# 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
46# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 46# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -50,4 +50,4 @@ BSC32=bscmake.exe
50LINK32=link.exe 50LINK32=link.exe
51# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE 51# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT
52$$MSVCDSP_COPY_DLL_REL 52$$MSVCDSP_POST_LINK_REL
53 53
@@ -66,3 +66,3 @@ $$MSVCDSP_COPY_DLL_REL
66# PROP Target_Dir "" 66# PROP Target_Dir ""
67# 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 67# 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
68# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 68# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -72,4 +72,4 @@ BSC32=bscmake.exe
72LINK32=link.exe 72LINK32=link.exe
73# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG 73# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT
74$$MSVCDSP_COPY_DLL_DBG 74$$MSVCDSP_POST_LINK_DBG
75 75
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
42# PROP Target_Dir "" 42# PROP Target_Dir ""
43# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE 43# 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
44# ADD RSC /l 0x409 /d "NDEBUG" 44# ADD RSC /l 0x409 /d "NDEBUG"
@@ -47,3 +47,4 @@ BSC32=bscmake.exe
47LIB32=link.exe -lib 47LIB32=link.exe -lib
48# ADD LIB32 /nologo $$MSVCDSP_TARGET 48# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
49$$MSVCDSP_POST_LINK_REL
49 50
@@ -61,3 +62,3 @@ LIB32=link.exe -lib
61# PROP Target_Dir "" 62# PROP Target_Dir ""
62# 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 63# 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
63# ADD RSC /l 0x409 /d "_DEBUG" 64# ADD RSC /l 0x409 /d "_DEBUG"
@@ -66,3 +67,4 @@ BSC32=bscmake.exe
66LIB32=link.exe -lib 67LIB32=link.exe -lib
67# ADD LIB32 /nologo $$MSVCDSP_TARGET 68# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
69$$MSVCDSP_POST_LINK_DBG
68 70