-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Windows Desktop arm64 target to Qtbase
Allows a qt build to be configured to target arm64 desktop apps cross platform and build them with nmake. Change-Id: I99fed12047b45a504a1644201bcc19b18c69f3e6 Reviewed-by: Oswald Buddenhagen <[email protected]> Reviewed-by: Oliver Wolff <[email protected]>
- Loading branch information
1 parent
59a0902
commit fbbe8ab
Showing
7 changed files
with
162 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # | ||
| # qmake configuration for win32-arm64-msvc2017 | ||
| # | ||
| # Written for Microsoft C/C++ Optimizing Compiler targeting arm64. | ||
| # | ||
|
|
||
| include(../common/msvc-desktop.conf) | ||
|
|
||
| WINSDK_VER = 10.0 | ||
| VCPROJ_ARCH = ARM64 | ||
|
|
||
| DEFINES += WIN64 | ||
| QMAKE_COMPILER_DEFINES += _WIN64 | ||
|
|
||
| load(qt_config) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /**************************************************************************** | ||
| ** | ||
| ** Copyright (C) 2016 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 "../win32-msvc/qplatformdefs.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| From 416fb93dae5009bb51da9f6720a95918a2c79e78 Mon Sep 17 00:00:00 2001 | ||
| From: Thomas Miller <[email protected]> | ||
| Date: Tue Oct 16 08:29:58 2018 -0700 | ||
| Subject: [PATCH] ANGLE: Fix build for ARM64 | ||
|
|
||
| __popcnt, SSE, and intrin.h are not available when building for ARM64. | ||
| --- | ||
| src/3rdparty/angle/src/common/mathutil.h | 8 ++++---- | ||
| src/3rdparty/angle/src/common/platform.h | 2 +- | ||
| 2 files changed, 5 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/src/3rdparty/angle/src/common/mathutil.h b/src/3rdparty/angle/src/common/mathutil.h | ||
| index 372e432066..88aedddfe8 100644 | ||
| --- a/src/3rdparty/angle/src/common/mathutil.h | ||
| +++ b/src/3rdparty/angle/src/common/mathutil.h | ||
| @@ -150,7 +150,7 @@ inline bool supportsSSE2() | ||
| return supports; | ||
| } | ||
|
|
||
| -#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) | ||
| +#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64) | ||
| { | ||
| int info[4]; | ||
| __cpuid(info, 0); | ||
| @@ -162,7 +162,7 @@ inline bool supportsSSE2() | ||
| supports = (info[3] >> 26) & 1; | ||
| } | ||
| } | ||
| -#endif // defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) | ||
| +#endif // defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64) | ||
| checked = true; | ||
| return supports; | ||
| #else // defined(ANGLE_USE_SSE) | ||
| @@ -884,14 +884,14 @@ inline uint32_t BitfieldReverse(uint32_t value) | ||
|
|
||
| // Count the 1 bits. | ||
| #if defined(ANGLE_PLATFORM_WINDOWS) | ||
| -#if defined(_M_ARM) | ||
| +#if defined(_M_ARM) || defined(_M_ARM64) | ||
| inline int BitCount(uint32_t bits) | ||
| { | ||
| bits = bits - ((bits >> 1) & 0x55555555); | ||
| bits = (bits & 0x33333333) + ((bits >> 2) & 0x33333333); | ||
| return (((bits + (bits >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24; | ||
| } | ||
| -#else // _M_ARM | ||
| +#else // _M_ARM || _M_ARM64 | ||
| inline int BitCount(uint32_t bits) | ||
| { | ||
| return static_cast<int>(__popcnt(bits)); | ||
| diff --git a/src/3rdparty/angle/src/common/platform.h b/src/3rdparty/angle/src/common/platform.h | ||
| index 47cd57b999..fb251da579 100644 | ||
| --- a/src/3rdparty/angle/src/common/platform.h | ||
| +++ b/src/3rdparty/angle/src/common/platform.h | ||
| @@ -83,7 +83,7 @@ | ||
| # undef far | ||
| #endif | ||
|
|
||
| -#if defined(_MSC_VER) && !defined(_M_ARM) | ||
| +#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) | ||
| #include <intrin.h> | ||
| #define ANGLE_USE_SSE | ||
| #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__MINGW32__) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters