From 3f9baf5cc85dbe73466fb2fc12a4457452ec5160 Mon Sep 17 00:00:00 2001 From: tooomm Date: Fri, 3 Jul 2026 16:23:15 +0200 Subject: [PATCH] remove 32bit --- .../network/update/client/release_channel.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp index 260167bc8..0b026008c 100644 --- a/cockatrice/src/client/network/update/client/release_channel.cpp +++ b/cockatrice/src/client/network/update/client/release_channel.cpp @@ -27,8 +27,6 @@ #define GIT_SHORT_HASH_LEN 7 ReleaseChannel::ReleaseChannel() : netMan(new QNetworkAccessManager(this)), response(nullptr), lastRelease(nullptr) -{ -} ReleaseChannel::~ReleaseChannel() { @@ -45,7 +43,7 @@ void ReleaseChannel::checkForUpdates() // Different release channel checking functions for different operating systems bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName) -{ + #if defined(Q_OS_MACOS) static QRegularExpression version_regex("macOS(\\d+)"); auto match = version_regex.match(fileName); @@ -59,7 +57,7 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName) char arch[255]; size_t len = sizeof(arch); if (sysctlbyname("machdep.cpu.brand_string", arch, &len, nullptr, 0) == 0) { - // Intel mac is only supported on macOS 13 versions + // Intel Mac is only supported on macOS 13 versions if (QString::fromUtf8(arch).contains("Intel")) { return 13; } @@ -74,13 +72,9 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName) return rel_maj == sys_maj; #elif defined(Q_OS_WIN) -#if Q_PROCESSOR_WORDSIZE == 4 - return fileName.contains("32bit"); -#elif Q_PROCESSOR_WORDSIZE == 8 +#if Q_PROCESSOR_WORDSIZE == 8 // 64-bit const QString &version = QSysInfo::productVersion(); - if (version.startsWith("7") || version.startsWith("8")) { - return fileName.contains("Win7"); - } else { + if (version.startsWith("10") { return fileName.contains("Win10"); } #else