diff --git a/Common/3dParty/boost/boost.pri b/Common/3dParty/boost/boost.pri index 7d6f30de2d..d2641185d6 100644 --- a/Common/3dParty/boost/boost.pri +++ b/Common/3dParty/boost/boost.pri @@ -26,12 +26,17 @@ bundle_xcframeworks { } } +core_win_arm64 { + DEFINES += MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS=0 +} + core_windows { VS_VERSION=140 VS_DEBUG= VS_ARCH=x64 core_debug:VS_DEBUG=gd- core_win_32:VS_ARCH=x32 + core_win_arm64:VS_ARCH=a64 vs2019:VS_VERSION=142 BOOST_POSTFIX = -vc$${VS_VERSION}-mt-$${VS_DEBUG}$${VS_ARCH}-1_72 diff --git a/Common/3dParty/icu/icu.pri b/Common/3dParty/icu/icu.pri index 9c853e6e1b..c872f8abd4 100644 --- a/Common/3dParty/icu/icu.pri +++ b/Common/3dParty/icu/icu.pri @@ -1,4 +1,4 @@ -ICU_MAJOR_VER = 58 +ICU_MAJOR_VER = 74 core_windows { exists($$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu) { diff --git a/Common/base.pri b/Common/base.pri index aa325e3e9b..76da324765 100644 --- a/Common/base.pri +++ b/Common/base.pri @@ -109,6 +109,11 @@ win32:!contains(QMAKE_TARGET.arch, x86_64): { CONFIG += core_win_32 } +win32-arm64-msvc2017 { + CONFIG -= core_win_32 + CONFIG += core_win_arm64 +} + linux-clang-libc++ { CONFIG += core_linux CONFIG += core_linux_64 @@ -285,6 +290,9 @@ core_win_32 { core_win_64 { CORE_BUILDS_PLATFORM_PREFIX = win_64 } +core_win_arm64 { + CORE_BUILDS_PLATFORM_PREFIX = win_arm64 +} core_linux_32 { CORE_BUILDS_PLATFORM_PREFIX = linux_32 }