diff options
| author | Andy Shaw <qt-info@nokia.com> | 2009-12-16 12:14:15 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2009-12-16 12:14:15 (GMT) |
| commit | e1706eab16a4cd7f64665249717cc293d3a1ce93 (patch) | |
| tree | 6c48ac6c93c26110223cb35f65c2e4869ef0995d /qmake/generators/win32 | |
| parent | d0d5d9d8e6d7815a0c97af28a7d231bfb9e83c19 (diff) | |
| download | Qt-e1706eab16a4cd7f64665249717cc293d3a1ce93.zip Qt-e1706eab16a4cd7f64665249717cc293d3a1ce93.tar.gz Qt-e1706eab16a4cd7f64665249717cc293d3a1ce93.tar.bz2 | |
Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj files
RevBy: Marius SO
Details: It worked fine for Makefiles since no checking is done of
the flags. Now its fixed so it works for vcproj files
too making it easier for people to build 64bit targets in
Visual Studio.
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 7dc456e..593a075 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1394,8 +1394,10 @@ bool VCLinkerTool::parseOption(const char* option) case 0x0005bb6: // X86 TargetMachine = machineX86; break; - // so we put the others in AdditionalOptions... case 0x0005b94: // X64 + TargetMachine = machineX64; + break; + // so we put the others in AdditionalOptions... case 0x0046063: // AM33 case 0x000466d: // ARM case 0x0004795: // CEE diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index d178d30..f7fdf3a 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -298,7 +298,8 @@ enum linkProgressOption { }; enum machineTypeOption { machineNotSet, - machineX86 + machineX86, + machineX64 = 17 }; enum midlCharOption { midlCharUnsigned, |