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
@@ -1,99 +1,106 @@
1# 1#
2# $Id$ 2# $Id$
3# 3#
4# qmake configuration for Win32/Microsoft C++ 4# qmake configuration for win32-msvc
5#
6# Written for Microsoft C++.
5# 7#
6 8
7 MAKEFILE_GENERATOR= MSVC 9 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
11 13
12exists( $(QTDIR)\.qtwinconfig ) { 14exists( $(QTDIR)\.qtwinconfig ) {
13 include( $(QTDIR)\.qtwinconfig ) 15 include( $(QTDIR)\.qtwinconfig )
14} 16}
15 17
16 QMAKE_CC = cl 18 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
20 QMAKE_YACCFLAGS = -d 22 QMAKE_YACCFLAGS = -d
21 QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) 23 QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA)
22 QMAKE_CFLAGS_WARN_ON= -W3 24 QMAKE_CFLAGS_WARN_ON= -W3
23 QMAKE_CFLAGS_WARN_OFF= -W0 25 QMAKE_CFLAGS_WARN_OFF= -W0
24 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1) 26 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1)
25 QMAKE_CFLAGS_DEBUG= -Zi 27 QMAKE_CFLAGS_DEBUG= -Zi
26 QMAKE_CFLAGS_MT = -MD 28 QMAKE_CFLAGS_MT = -MD
27 QMAKE_CFLAGS_MT_DBG= -MDd 29 QMAKE_CFLAGS_MT_DBG= -MDd
28 QMAKE_CFLAGS_MT_DLL= -MD 30 QMAKE_CFLAGS_MT_DLL= -MD
29 QMAKE_CFLAGS_MT_DLLDBG= -MDd 31 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
42 QMAKE_CXX = $$QMAKE_CC 40 QMAKE_CXX = $$QMAKE_CC
43 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) 41 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
44 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON 42 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
45 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF 43 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
46 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE 44 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
47 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG 45 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
48 QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT 46 QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT
49 QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG 47 QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG
50 QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL 48 QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL
51QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG 49QMAKE_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
55 QMAKE_INCDIR = 58 QMAKE_INCDIR =
56 QMAKE_INCDIR_QT = $(QTDIR)\include 59 QMAKE_INCDIR_QT = $(QTDIR)\include
57 QMAKE_LIBDIR_QT = $(QTDIR)\lib 60 QMAKE_LIBDIR_QT = $(QTDIR)\lib
58 61
59 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src 62 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
64 QMAKE_LINK = link 69 QMAKE_LINK = link
65 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) 70 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA)
66 QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll 71 QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
67 QMAKE_LFLAGS_DEBUG= /DEBUG 72 QMAKE_LFLAGS_DEBUG= /DEBUG
68 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console 73 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console
69 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows 74 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows
70QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL 75QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
71QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL 76QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
72 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 77 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000
73 78
74 QMAKE_LIBS = $(LIBS_EXTRA) 79 QMAKE_LIBS = $(LIBS_EXTRA)
75 QMAKE_LIBS_CONSOLE= 80 QMAKE_LIBS_CONSOLE=
76 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 81 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
77 QMAKE_LIBS_QT = qt.lib 82 QMAKE_LIBS_QT = qt.lib
78 QMAKE_LIBS_QT_THREAD= qt-mt.lib 83 QMAKE_LIBS_QT_THREAD= qt-mt.lib
79 QMAKE_LIBS_QT_ENTRY= qtmain.lib 84 QMAKE_LIBS_QT_ENTRY= qtmain.lib
80 85
81 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib 86 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib
82 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll 87 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll
83 88
84 QMAKE_MOC = $(QTDIR)\bin\moc.exe 89 QMAKE_MOC = $(QTDIR)\bin\moc.exe
85 QMAKE_UIC = $(QTDIR)\bin\uic.exe 90 QMAKE_UIC = $(QTDIR)\bin\uic.exe
86 QMAKE_IDC = $(QTDIR)\bin\idc.exe 91 QMAKE_IDC = $(QTDIR)\bin\idc.exe
87 92
88 QMAKE_IDL = midl 93 QMAKE_IDL = midl
89 QMAKE_LIB = lib /NOLOGO 94 QMAKE_LIB = lib /NOLOGO
90 QMAKE_RC = rc 95 QMAKE_RC = rc
91 96
92 QMAKE_ZIP = zip -r -9 97 QMAKE_ZIP = zip -r -9
93 98
94 QMAKE_COPY = copy 99 QMAKE_COPY = copy
95 QMAKE_MOVE = move 100 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
99 DSP_EXTENSION = .dsp 106 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
@@ -5,69 +5,69 @@
5#ifndef _UNICODE 5#ifndef _UNICODE
6#define _UNICODE 6#define _UNICODE
7#endif 7#endif
8#endif 8#endif
9 9
10// Get Qt defines/settings 10// Get Qt defines/settings
11 11
12#include "qglobal.h" 12#include "qglobal.h"
13 13
14#define _POSIX_ 14#define _POSIX_
15#include <limits.h> 15#include <limits.h>
16#undef _POSIX_ 16#undef _POSIX_
17 17
18#include <tchar.h> 18#include <tchar.h>
19#include <io.h> 19#include <io.h>
20#include <direct.h> 20#include <direct.h>
21#include <stdio.h> 21#include <stdio.h>
22#include <fcntl.h> 22#include <fcntl.h>
23#include <errno.h> 23#include <errno.h>
24#include <sys/stat.h> 24#include <sys/stat.h>
25#include <stdlib.h> 25#include <stdlib.h>
26#include <windows.h> 26#include <windows.h>
27 27
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
31 #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs 31 #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs
32 #define QT_STAT ::_stati64 32 #define QT_STAT ::_stati64
33 #define QT_FSTAT ::_fstati64 33 #define QT_FSTAT ::_fstati64
34#else 34#else
35 #define QT_STATBUF struct _stat // non-ANSI defs 35 #define QT_STATBUF struct _stat // non-ANSI defs
36 #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs 36 #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs
37 #define QT_STAT ::_stat 37 #define QT_STAT ::_stat
38 #define QT_FSTAT ::_fstat 38 #define QT_FSTAT ::_fstat
39#endif 39#endif
40 #define QT_STAT_REG _S_IFREG 40 #define QT_STAT_REG _S_IFREG
41 #define QT_STAT_DIR _S_IFDIR 41 #define QT_STAT_DIR _S_IFDIR
42 #define QT_STAT_MASK _S_IFMT 42 #define QT_STAT_MASK _S_IFMT
43#if defined(_S_IFLNK) 43#if defined(_S_IFLNK)
44 # define QT_STAT_LNK _S_IFLNK 44 # define QT_STAT_LNK _S_IFLNK
45#endif 45#endif
46 #define QT_FILENO _fileno 46 #define QT_FILENO _fileno
47 #define QT_OPEN ::_open 47 #define QT_OPEN ::_open
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
51 #define QT_TSTAT ::_tstati64 51 #define QT_TSTAT ::_tstati64
52#else 52#else
53 #define QT_LSEEK ::_lseek 53 #define QT_LSEEK ::_lseek
54 #define QT_TSTAT ::_tstat 54 #define QT_TSTAT ::_tstat
55#endif 55#endif
56 #define QT_READ ::_read 56 #define QT_READ ::_read
57 #define QT_WRITE ::_write 57 #define QT_WRITE ::_write
58 #define QT_ACCESS ::_access 58 #define QT_ACCESS ::_access
59 #define QT_GETCWD ::_getcwd 59 #define QT_GETCWD ::_getcwd
60 #define QT_CHDIR ::_chdir 60 #define QT_CHDIR ::_chdir
61 #define QT_MKDIR ::_mkdir 61 #define QT_MKDIR ::_mkdir
62 #define QT_RMDIR ::_rmdir 62 #define QT_RMDIR ::_rmdir
63 #define QT_OPEN_RDONLY _O_RDONLY 63 #define QT_OPEN_RDONLY _O_RDONLY
64 #define QT_OPEN_WRONLY _O_WRONLY 64 #define QT_OPEN_WRONLY _O_WRONLY
65 #define QT_OPEN_RDWR _O_RDWR 65 #define QT_OPEN_RDWR _O_RDWR
66 #define QT_OPEN_CREAT _O_CREAT 66 #define QT_OPEN_CREAT _O_CREAT
67 #define QT_OPEN_TRUNC _O_TRUNC 67 #define QT_OPEN_TRUNC _O_TRUNC
68 #define QT_OPEN_APPEND _O_APPEND 68 #define QT_OPEN_APPEND _O_APPEND
69#if defined(O_TEXT) 69#if defined(O_TEXT)
70 # define QT_OPEN_TEXT _O_TEXT 70 # define QT_OPEN_TEXT _O_TEXT
71 # define QT_OPEN_BINARY _O_BINARY 71 # define QT_OPEN_BINARY _O_BINARY
72#endif 72#endif
73 73
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
@@ -20,77 +20,77 @@ CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE
20!MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Application") 20!MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Application")
21!MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Application") 21!MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Application")
22!MESSAGE 22!MESSAGE
23 23
24# Begin Project 24# Begin Project
25# PROP AllowPerConfigDependencies 0 25# PROP AllowPerConfigDependencies 0
26# PROP Scc_ProjName "" 26# PROP Scc_ProjName ""
27# PROP Scc_LocalPath "" 27# PROP Scc_LocalPath ""
28CPP=cl.exe 28CPP=cl.exe
29MTL=midl.exe 29MTL=midl.exe
30RSC=rc.exe 30RSC=rc.exe
31 31
32!IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" 32!IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release"
33 33
34# PROP BASE Use_MFC 0 34# PROP BASE Use_MFC 0
35# PROP BASE Use_Debug_Libraries 0 35# PROP BASE Use_Debug_Libraries 0
36# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" 36# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL"
37# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" 37# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
38# PROP BASE Target_Dir "" 38# PROP BASE Target_Dir ""
39# PROP Use_MFC 0 39# PROP Use_MFC 0
40# PROP Use_Debug_Libraries 0 40# PROP Use_Debug_Libraries 0
41# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" 41# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
42# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" 42# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
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
46# ADD RSC /l 0x409 /d "NDEBUG" 46# ADD RSC /l 0x409 /d "NDEBUG"
47BSC32=bscmake.exe 47BSC32=bscmake.exe
48# ADD BSC32 /nologo 48# ADD BSC32 /nologo
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
53!ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" 53!ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
54 54
55# PROP BASE Use_MFC 0 55# PROP BASE Use_MFC 0
56# PROP BASE Use_Debug_Libraries 1 56# PROP BASE Use_Debug_Libraries 1
57# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" 57# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB"
58# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" 58# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
59# PROP BASE Target_Dir "" 59# PROP BASE Target_Dir ""
60# PROP Use_MFC 0 60# PROP Use_MFC 0
61# PROP Use_Debug_Libraries 1 61# PROP Use_Debug_Libraries 1
62# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" 62# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
63# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" 63# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
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
67# ADD RSC /l 0x409 /d "_DEBUG" 67# ADD RSC /l 0x409 /d "_DEBUG"
68BSC32=bscmake.exe 68BSC32=bscmake.exe
69# ADD BSC32 /nologo 69# ADD BSC32 /nologo
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
74!ENDIF 74!ENDIF
75 75
76# Begin Target 76# Begin Target
77 77
78# Name "$$MSVCDSP_PROJECT - Win32 Release" 78# Name "$$MSVCDSP_PROJECT - Win32 Release"
79# Name "$$MSVCDSP_PROJECT - Win32 Debug" 79# Name "$$MSVCDSP_PROJECT - Win32 Debug"
80# Begin Group "Source Files" 80# Begin Group "Source Files"
81 81
82# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" 82# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
83$$MSVCDSP_SOURCES 83$$MSVCDSP_SOURCES
84# End Group 84# End Group
85# Begin Group "Header Files" 85# Begin Group "Header Files"
86 86
87# PROP Default_Filter "h;hpp;hxx;hm;inl" 87# PROP Default_Filter "h;hpp;hxx;hm;inl"
88$$MSVCDSP_HEADERS 88$$MSVCDSP_HEADERS
89# End Group 89# End Group
90# Begin Group "Resource Files" 90# Begin Group "Resource Files"
91 91
92# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" 92# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
93# End Group 93# End Group
94 94
95$$MSVCDSP_FORMS 95$$MSVCDSP_FORMS
96$$MSVCDSP_TRANSLATIONS 96$$MSVCDSP_TRANSLATIONS
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
@@ -21,78 +21,78 @@ CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE
21!MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") 21!MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
22!MESSAGE 22!MESSAGE
23 23
24# Begin Project 24# Begin Project
25# PROP AllowPerConfigDependencies 0 25# PROP AllowPerConfigDependencies 0
26# PROP Scc_ProjName "" 26# PROP Scc_ProjName ""
27# PROP Scc_LocalPath "" 27# PROP Scc_LocalPath ""
28CPP=cl.exe 28CPP=cl.exe
29MTL=midl.exe 29MTL=midl.exe
30RSC=rc.exe 30RSC=rc.exe
31 31
32!IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" 32!IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release"
33 33
34# PROP BASE Use_MFC 0 34# PROP BASE Use_MFC 0
35# PROP BASE Use_Debug_Libraries 0 35# PROP BASE Use_Debug_Libraries 0
36# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" 36# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL"
37# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" 37# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
38# PROP BASE Target_Dir "" 38# PROP BASE Target_Dir ""
39# PROP Use_MFC 0 39# PROP Use_MFC 0
40# PROP Use_Debug_Libraries 0 40# PROP Use_Debug_Libraries 0
41# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" 41# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
42# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" 42# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
43# PROP Ignore_Export_Lib 1 43# PROP Ignore_Export_Lib 1
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
47# ADD RSC /l 0x409 /d "NDEBUG" 47# ADD RSC /l 0x409 /d "NDEBUG"
48BSC32=bscmake.exe 48BSC32=bscmake.exe
49# ADD BSC32 /nologo 49# ADD BSC32 /nologo
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
54!ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" 54!ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
55 55
56# PROP BASE Use_MFC 0 56# PROP BASE Use_MFC 0
57# PROP BASE Use_Debug_Libraries 1 57# PROP BASE Use_Debug_Libraries 1
58# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" 58# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB"
59# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" 59# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
60# PROP BASE Target_Dir "" 60# PROP BASE Target_Dir ""
61# PROP Use_MFC 0 61# PROP Use_MFC 0
62# PROP Use_Debug_Libraries 1 62# PROP Use_Debug_Libraries 1
63# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" 63# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
64# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" 64# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
65# PROP Ignore_Export_Lib 1 65# PROP Ignore_Export_Lib 1
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
69# ADD RSC /l 0x409 /d "_DEBUG" 69# ADD RSC /l 0x409 /d "_DEBUG"
70BSC32=bscmake.exe 70BSC32=bscmake.exe
71# ADD BSC32 /nologo 71# ADD BSC32 /nologo
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
76!ENDIF 76!ENDIF
77 77
78# Begin Target 78# Begin Target
79 79
80# Name "$$MSVCDSP_PROJECT - Win32 Release" 80# Name "$$MSVCDSP_PROJECT - Win32 Release"
81# Name "$$MSVCDSP_PROJECT - Win32 Debug" 81# Name "$$MSVCDSP_PROJECT - Win32 Debug"
82# Begin Group "Source Files" 82# Begin Group "Source Files"
83 83
84# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" 84# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
85$$MSVCDSP_SOURCES 85$$MSVCDSP_SOURCES
86# End Group 86# End Group
87# Begin Group "Header Files" 87# Begin Group "Header Files"
88 88
89# PROP Default_Filter "h;hpp;hxx;hm;inl" 89# PROP Default_Filter "h;hpp;hxx;hm;inl"
90$$MSVCDSP_HEADERS 90$$MSVCDSP_HEADERS
91# End Group 91# End Group
92# Begin Group "Resource Files" 92# Begin Group "Resource Files"
93 93
94# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" 94# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
95# End Group 95# End Group
96 96
97$$MSVCDSP_FORMS 97$$MSVCDSP_FORMS
98$$MSVCDSP_TRANSLATIONS 98$$MSVCDSP_TRANSLATIONS
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
@@ -19,73 +19,75 @@ CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE
19!MESSAGE 19!MESSAGE
20!MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Static Library") 20!MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Static Library")
21!MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Static Library") 21!MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Static Library")
22!MESSAGE 22!MESSAGE
23 23
24# Begin Project 24# Begin Project
25# PROP AllowPerConfigDependencies 0 25# PROP AllowPerConfigDependencies 0
26# PROP Scc_ProjName "" 26# PROP Scc_ProjName ""
27# PROP Scc_LocalPath "" 27# PROP Scc_LocalPath ""
28CPP=cl.exe 28CPP=cl.exe
29RSC=rc.exe 29RSC=rc.exe
30 30
31!IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" 31!IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release"
32 32
33# PROP BASE Use_MFC 0 33# PROP BASE Use_MFC 0
34# PROP BASE Use_Debug_Libraries 0 34# PROP BASE Use_Debug_Libraries 0
35# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" 35# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL"
36# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" 36# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
37# PROP BASE Target_Dir "" 37# PROP BASE Target_Dir ""
38# PROP Use_MFC 0 38# PROP Use_MFC 0
39# PROP Use_Debug_Libraries 0 39# PROP Use_Debug_Libraries 0
40# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" 40# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
41# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" 41# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
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"
45BSC32=bscmake.exe 45BSC32=bscmake.exe
46# ADD BSC32 /nologo 46# ADD BSC32 /nologo
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
50!ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" 51!ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
51 52
52# PROP BASE Use_MFC 0 53# PROP BASE Use_MFC 0
53# PROP BASE Use_Debug_Libraries 1 54# PROP BASE Use_Debug_Libraries 1
54# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" 55# PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB"
55# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" 56# PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
56# PROP BASE Target_Dir "" 57# PROP BASE Target_Dir ""
57# PROP Use_MFC 0 58# PROP Use_MFC 0
58# PROP Use_Debug_Libraries 1 59# PROP Use_Debug_Libraries 1
59# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" 60# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
60# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" 61# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
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"
64BSC32=bscmake.exe 65BSC32=bscmake.exe
65# ADD BSC32 /nologo 66# ADD BSC32 /nologo
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
69!ENDIF 71!ENDIF
70 72
71# Begin Target 73# Begin Target
72 74
73# Name "$$MSVCDSP_PROJECT - Win32 Release" 75# Name "$$MSVCDSP_PROJECT - Win32 Release"
74# Name "$$MSVCDSP_PROJECT - Win32 Debug" 76# Name "$$MSVCDSP_PROJECT - Win32 Debug"
75# Begin Group "Source Files" 77# Begin Group "Source Files"
76 78
77# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" 79# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
78$$MSVCDSP_SOURCES 80$$MSVCDSP_SOURCES
79# End Group 81# End Group
80# Begin Group "Header Files" 82# Begin Group "Header Files"
81 83
82# PROP Default_Filter "h;hpp;hxx;hm;inl" 84# PROP Default_Filter "h;hpp;hxx;hm;inl"
83$$MSVCDSP_HEADERS 85$$MSVCDSP_HEADERS
84# End Group 86# End Group
85# Begin Group "Resource Files" 87# Begin Group "Resource Files"
86 88
87# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" 89# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
88# End Group 90# End Group
89 91
90$$MSVCDSP_FORMS 92$$MSVCDSP_FORMS
91$$MSVCDSP_TRANSLATIONS 93$$MSVCDSP_TRANSLATIONS