Add constants for Windows on ARM.

FajoX1 · Jul 17, 2024 · 5463913 · 5463913
1 parent 1a50fd2
commit 5463913
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/base/platform/base_platform_info.h b/base/platform/base_platform_info.h
@@ -44,6 +44,7 @@ enum class OutdateReason {
 [[nodiscard]] constexpr bool IsWindows();
 [[nodiscard]] constexpr bool IsWindows32Bit();
 [[nodiscard]] constexpr bool IsWindows64Bit();
+[[nodiscard]] constexpr bool IsWindowsARM64();
 [[nodiscard]] constexpr bool IsWindowsStoreBuild();
 [[nodiscard]] bool IsWindows7OrGreater();
 [[nodiscard]] bool IsWindows8OrGreater();

diff --git a/base/platform/linux/base_info_linux.h b/base/platform/linux/base_info_linux.h
@@ -21,6 +21,7 @@ inline constexpr bool IsLinux() {
 inline constexpr bool IsWindows() { return false; }
 inline constexpr bool IsWindows32Bit() { return false; }
 inline constexpr bool IsWindows64Bit() { return false; }
+inline constexpr bool IsWindowsARM64() { return false; }
 inline constexpr bool IsWindowsStoreBuild() { return false; }
 inline bool IsWindows7OrGreater() { return false; }
 inline bool IsWindows8OrGreater() { return false; }

diff --git a/base/platform/mac/base_info_mac.h b/base/platform/mac/base_info_mac.h
@@ -29,6 +29,7 @@ inline constexpr bool IsMacStoreBuild() {
 inline constexpr bool IsWindows() { return false; }
 inline constexpr bool IsWindows32Bit() { return false; }
 inline constexpr bool IsWindows64Bit() { return false; }
+inline constexpr bool IsWindowsARM64() { return false; }
 inline constexpr bool IsWindowsStoreBuild() { return false; }
 inline bool IsWindows7OrGreater() { return false; }
 inline bool IsWindows8OrGreater() { return false; }

diff --git a/base/platform/win/base_info_win.cpp b/base/platform/win/base_info_win.cpp
@@ -275,7 +275,9 @@ int AutoUpdateVersion() {
 }
 
 QString AutoUpdateKey() {
-	if (IsWindows64Bit()) {
+	if (IsWindowsARM64()) {
+		return "winarm";
+	} else if (IsWindows64Bit()) {
 		return "win64";
 	} else {
 		return "win";

diff --git a/base/platform/win/base_info_win.h b/base/platform/win/base_info_win.h
@@ -34,6 +34,14 @@ inline constexpr bool IsWindows64Bit() {
 #endif // Q_PROCESSOR_X86_64
 }
 
+inline constexpr bool IsWindowsARM64() {
+#ifdef Q_PROCESSOR_ARM_64
+	return true;
+#else // Q_PROCESSOR_ARM_64
+	return false;
+#endif // Q_PROCESSOR_ARM_64
+}
+
 inline constexpr bool IsWindowsStoreBuild() {
 #ifdef OS_WIN_STORE
 	return true;