diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-05-03 11:42:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-07 15:02:59 +0200 |
| commit | ca354843c8dffe20b6935ea431d77e7f1bdf4a58 (patch) | |
| tree | 4db2a305ce581a9210b4bfcd5bb8c21f1e0aaefb /mkspecs/win32-msvc2010 | |
| parent | 267dc53ea70b6d26313daf183cc45d5bb84ea692 (diff) | |
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 <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/win32-msvc2010')
| -rw-r--r-- | mkspecs/win32-msvc2010/qmake.conf | 4 |
1 files changed, 4 insertions, 0 deletions
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 |