From 259f06d4bd783a49ec56c90e182f3334733826f8 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 26 Jul 2016 18:23:03 +0200 Subject: [PATCH] Changed: 64 bits clients only available since Vista under Windows, see #279 --- code/ryzom/tools/client/ryzom_installer/src/configfile.cpp | 5 +++++ .../ryzom/tools/client/ryzom_installer/src/installdialog.cpp | 1 - .../ryzom/tools/client/ryzom_installer/src/migratedialog.cpp | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 663eff3ea..1181dd613 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -455,6 +455,11 @@ QString CConfigFile::getMenuDirectory() const bool CConfigFile::has64bitsOS() { +#ifdef Q_OS_WIN32 + // 64 bits only supported under Vista and up + if (QSysInfo::windowsVersion() < QSysInfo::WV_VISTA) return false; +#endif + return QSysInfo::currentCpuArchitecture() == "x86_64"; } diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index ff5bfc6c7..baf9516f0 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -54,7 +54,6 @@ CInstallDialog::CInstallDialog():QDialog() updateDestinationText(); // check whether OS architecture is 32 or 64 bits - // TODO: 64 bits client only supported under Vista+ if (CConfigFile::has64bitsOS()) { clientArchGroupBox->setVisible(true); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index 50fa92412..b2941744c 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -51,7 +51,6 @@ CMigrateDialog::CMigrateDialog():QDialog() updateDestinationText(); // check whether OS architecture is 32 or 64 bits - // TODO: 64 bits client only supported under Vista+ if (CConfigFile::has64bitsOS()) { clientArchGroupBox->setVisible(true);