From 267dc53ea70b6d26313daf183cc45d5bb84ea692 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 3 May 2013 11:37:49 +0200 Subject: fix _WIN32 compiler defines for MSVC The compiler defines _WIN32, not WIN32. Change-Id: I359a188b4ef145b7b78c35c5b72a804200b76507 Reviewed-by: Oswald Buddenhagen --- mkspecs/win32-msvc2005/qmake.conf | 2 +- mkspecs/win32-msvc2008/qmake.conf | 2 +- mkspecs/win32-msvc2010/qmake.conf | 2 +- mkspecs/win32-msvc2012/qmake.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 6d072242c9..3b01b77d38 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -8,7 +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 -QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32 +QMAKE_COMPILER_DEFINES += _MSC_VER=1400 _WIN32 QMAKE_COMPILER = msvc diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index bd9a83a5d1..eee56b6c60 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -8,7 +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 -QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32 +QMAKE_COMPILER_DEFINES += _MSC_VER=1500 _WIN32 QMAKE_COMPILER = msvc diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index f0e44078f9..a55bdb28af 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -8,7 +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 -QMAKE_COMPILER_DEFINES += _MSC_VER=1600 WIN32 +QMAKE_COMPILER_DEFINES += _MSC_VER=1600 _WIN32 QMAKE_COMPILER = msvc diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf index c9e3f8c8e0..56b8f04e24 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -7,7 +7,7 @@ MAKEFILE_GENERATOR = MSBUILD CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNICODE WIN32 -QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32 +QMAKE_COMPILER_DEFINES += _MSC_VER=1700 _WIN32 QMAKE_COMPILER = msvc -- cgit v1.2.3