Merge pull request #10759 from shuffle2/arm64-update

updater: use new platform id for win-arm64
This commit is contained in:
Pierre Bourdon 2022-06-17 07:04:35 +02:00 committed by GitHub
commit f50db76426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

View File

@ -128,22 +128,22 @@ std::string GenerateChangelog(const picojson::array& versions)
bool AutoUpdateChecker::SystemSupportsAutoUpdates() bool AutoUpdateChecker::SystemSupportsAutoUpdates()
{ {
#if defined AUTOUPDATE #if defined(AUTOUPDATE) && (defined(_WIN32) || defined(__APPLE__))
#if defined _WIN32 || defined __APPLE__
return true; return true;
#else #else
return false; return false;
#endif #endif
#else
return false;
#endif
} }
static std::string GetPlatformID() static std::string GetPlatformID()
{ {
#if defined _WIN32 #if defined(_WIN32)
#if defined(_M_ARM_64)
return "win-arm64";
#else
return "win"; return "win";
#elif defined __APPLE__ #endif
#elif defined(__APPLE__)
#if defined(MACOS_UNIVERSAL_BUILD) #if defined(MACOS_UNIVERSAL_BUILD)
return "macos-universal"; return "macos-universal";
#else #else