From 2a48b60dbd08a29dcebc3128b5379fe4f11b18eb Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 21 Apr 2017 09:26:04 +0200 Subject: winrt: Add arm mkspec for msvc 2017 While a previous commit added the logic for handling arm from a qmake perspective, the responsible mkspec was forgotten. Change-Id: I5f36d411f2d2c22d8b048e0931da50d911e7e1b4 Reviewed-by: Jake Petroules --- mkspecs/winrt-arm-msvc2017/qmake.conf | 20 +++++++++++++++ mkspecs/winrt-arm-msvc2017/qplatformdefs.h | 40 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 mkspecs/winrt-arm-msvc2017/qmake.conf create mode 100644 mkspecs/winrt-arm-msvc2017/qplatformdefs.h (limited to 'mkspecs/winrt-arm-msvc2017') diff --git a/mkspecs/winrt-arm-msvc2017/qmake.conf b/mkspecs/winrt-arm-msvc2017/qmake.conf new file mode 100644 index 0000000000..bf571d620c --- /dev/null +++ b/mkspecs/winrt-arm-msvc2017/qmake.conf @@ -0,0 +1,20 @@ +# +# qmake configuration for winrt-arm-msvc2017 +# +# Written for Microsoft Visual C++ 2017 +# + +include(../common/winrt_winphone/qmake.conf) +DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PHONE_APP=1 ARM __ARM__ __arm__ + +QMAKE_CFLAGS += -FS +QMAKE_CXXFLAGS += -FS +QMAKE_LFLAGS += /MACHINE:ARM /NODEFAULTLIB:kernel32.lib + +QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib OneCore.lib + +VCPROJ_ARCH = ARM +WINSDK_VER = 10.0 +WINTARGET_VER = winv10.0 +WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in +WINRT_MANIFEST.architecture = arm diff --git a/mkspecs/winrt-arm-msvc2017/qplatformdefs.h b/mkspecs/winrt-arm-msvc2017/qplatformdefs.h new file mode 100644 index 0000000000..907834d385 --- /dev/null +++ b/mkspecs/winrt-arm-msvc2017/qplatformdefs.h @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../common/winrt_winphone/qplatformdefs.h" -- cgit v1.2.3