From ca354843c8dffe20b6935ea431d77e7f1bdf4a58 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 3 May 2013 11:42:02 +0200 Subject: qmake/vcxproj: add WIN64 macro for x86_46 builds The compiler defines _WIN32 for x86 builds. The compiler defines _WIN32 and _WIN64 for x86_64 builds. For consistency, the same should happen to the user defined macros without underscore. The WIN32 macro is added in the win32-* mkspecs. Task-number: QTBUG-30223 Change-Id: I342afed731f4ba253a2708b98f575039a04613d7 Reviewed-by: Oswald Buddenhagen --- mkspecs/win32-msvc2005/qmake.conf | 4 ++++ mkspecs/win32-msvc2008/qmake.conf | 4 ++++ mkspecs/win32-msvc2010/qmake.conf | 4 ++++ mkspecs/win32-msvc2012/qmake.conf | 4 ++++ 4 files changed, 16 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 3b01b77d38..508db2a11c 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -9,6 +9,10 @@ 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 +contains(QMAKE_TARGET.arch, x86_64) { + DEFINES += WIN64 + QMAKE_COMPILER_DEFINES += _WIN64 +} QMAKE_COMPILER = msvc diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index eee56b6c60..7d1304aaed 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -9,6 +9,10 @@ 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 +contains(QMAKE_TARGET.arch, x86_64) { + DEFINES += WIN64 + QMAKE_COMPILER_DEFINES += _WIN64 +} QMAKE_COMPILER = msvc diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index a55bdb28af..ebe043ceba 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -9,6 +9,10 @@ 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 +contains(QMAKE_TARGET.arch, x86_64) { + DEFINES += WIN64 + QMAKE_COMPILER_DEFINES += _WIN64 +} QMAKE_COMPILER = msvc diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf index 56b8f04e24..19bd10484b 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -8,6 +8,10 @@ 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 +contains(QMAKE_TARGET.arch, x86_64) { + DEFINES += WIN64 + QMAKE_COMPILER_DEFINES += _WIN64 +} QMAKE_COMPILER = msvc -- cgit v1.2.3