AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WinRT: Use correct architecture values in manifests and vs

Browse Source 
Using the same architecture value in VC Project and manifest
files only makes sense for x64. Instead of doing magic we
just set the correct values inside the mkspecs. VCPROJ_ARCH
is used for Visual Studio, while the manifests use
WINRT_MANIFEST.architecture.

WINRT_MANIFEST.architecture was added to x64 mkspecs for
consistency and phone mkspecs do not use WINRT_MANIFEST.architecture
so it does not have to be set there.

Change-Id: I009473104875b4add8c0530dc6f51177919e997b
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
This commit is contained in:
Oliver Wolff 2014-02-06 10:26:02 +01:00 committed by The Qt Project
parent f13f10ee0d
commit 93aec932ff
7 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/winphone-x86-msvc2012/qmake.conf
View File

@ -13,7 +13,7 @@ QMAKE_LFLAGS += /MACHINE:X86
QMAKE_LIBS += WindowsPhoneCore.lib PhoneAppModelHost.lib ws2_32.lib
VCPROJ_ARCH = x86
VCPROJ_ARCH = Win32
MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = WP80

1
mkspecs/winrt-arm-msvc2012/qmake.conf
View File

@ -17,3 +17,4 @@ MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = win8
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
WINRT_MANIFEST.architecture = arm

1
mkspecs/winrt-arm-msvc2013/qmake.conf
View File

@ -19,3 +19,4 @@ MSVC_VER = 12.0
WINSDK_VER = 8.1
WINTARGET_VER = winv6.3
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
WINRT_MANIFEST.architecture = arm

1
mkspecs/winrt-x64-msvc2012/qmake.conf
View File

@ -17,3 +17,4 @@ MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = win8
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
WINRT_MANIFEST.architecture = x64

1
mkspecs/winrt-x64-msvc2013/qmake.conf
View File

@ -19,3 +19,4 @@ MSVC_VER = 12.0
WINSDK_VER = 8.1
WINTARGET_VER = winv6.3
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
WINRT_MANIFEST.architecture = x64

3
mkspecs/winrt-x86-msvc2012/qmake.conf
View File

@ -12,8 +12,9 @@ QMAKE_LFLAGS += /SAFESEH /MACHINE:X86
QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib
VCPROJ_ARCH = x86
VCPROJ_ARCH = Win32
MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = win8
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
WINRT_MANIFEST.architecture = x86

3
mkspecs/winrt-x86-msvc2013/qmake.conf
View File

@ -14,8 +14,9 @@ QMAKE_LFLAGS += /SAFESEH /MACHINE:X86
QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib
VCPROJ_ARCH = x86
VCPROJ_ARCH = Win32
MSVC_VER = 12.0
WINSDK_VER = 8.1
WINTARGET_VER = winv6.3
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
WINRT_MANIFEST.architecture = x86