diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-03-14 09:26:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-20 10:36:34 +0100 |
| commit | 943fc7d782207b0dc35057ee934169bd8cb2a322 (patch) | |
| tree | 3bc89c9c74e8133600fa8197669554fc964eac55 /mkspecs | |
| parent | d278695e56d46f6da6e733adc69064627af688e3 (diff) | |
encode the MSVC version in our mkspecs
This will enable qmake and its users to make decisions based
on the Visual Studio version without guessing it from the
mkspec's name.
Change-Id: I1bb46161111b109c2b4302bfc8c428b5f63c32d9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/win32-msvc2005/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2008/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2010/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2012/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2013/qmake.conf | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 4a0fab761e..d89bfba958 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -8,6 +8,7 @@ MAKEFILE_GENERATOR = MSVC.NET QMAKE_PLATFORM = win32 CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNICODE WIN32 +MSVC_VER = 8.0 QMAKE_COMPILER_DEFINES += _MSC_VER=1400 _WIN32 contains(QMAKE_TARGET.arch, x86_64) { DEFINES += WIN64 diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index 8fd6eb0c7d..35693d0356 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -8,6 +8,7 @@ MAKEFILE_GENERATOR = MSVC.NET QMAKE_PLATFORM = win32 CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNICODE WIN32 +MSVC_VER = 9.0 QMAKE_COMPILER_DEFINES += _MSC_VER=1500 _WIN32 contains(QMAKE_TARGET.arch, x86_64) { DEFINES += WIN64 diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index 07422abb0a..f24da2d5c6 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -8,6 +8,7 @@ MAKEFILE_GENERATOR = MSBUILD QMAKE_PLATFORM = win32 CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNICODE WIN32 +MSVC_VER = 10.0 QMAKE_COMPILER_DEFINES += _MSC_VER=1600 _WIN32 contains(QMAKE_TARGET.arch, x86_64) { DEFINES += WIN64 diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf index 45054862ba..18ffc27711 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -8,6 +8,7 @@ MAKEFILE_GENERATOR = MSBUILD QMAKE_PLATFORM = win32 CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNICODE WIN32 +MSVC_VER = 11.0 QMAKE_COMPILER_DEFINES += _MSC_VER=1700 _WIN32 contains(QMAKE_TARGET.arch, x86_64) { DEFINES += WIN64 diff --git a/mkspecs/win32-msvc2013/qmake.conf b/mkspecs/win32-msvc2013/qmake.conf index 9fc69e4d1a..ad46a2fb72 100644 --- a/mkspecs/win32-msvc2013/qmake.conf +++ b/mkspecs/win32-msvc2013/qmake.conf @@ -8,6 +8,7 @@ MAKEFILE_GENERATOR = MSBUILD QMAKE_PLATFORM = win32 CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNICODE WIN32 +MSVC_VER = 12.0 QMAKE_COMPILER_DEFINES += _MSC_VER=1800 _WIN32 contains(QMAKE_TARGET.arch, x86_64) { DEFINES += WIN64 |