Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Only install same client arch as Installer under Linux

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-10-13 19:50:11 +02:00
parent 4d6842495d
commit 016e075fa5
2 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
View file

@ -40,7 +40,9 @@ CInstallDialog::CInstallDialog():QDialog()
clientArchGroupBox->setVisible(false); clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true); clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false); clientArch32RadioButton->setChecked(false);
#else #elif defined(Q_OS_WIN32)
// both 32 and 64 bits are working under Windows 64 bits
// check whether OS architecture is 32 or 64 bits // check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS()) if (CConfigFile::has64bitsOS())
{ {
@ -55,7 +57,22 @@ CInstallDialog::CInstallDialog():QDialog()
clientArchGroupBox->setVisible(false); clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(false); clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true); clientArch32RadioButton->setChecked(true);
} }
#else
// only use the current architecture for Linux
clientArchGroupBox->setVisible(false);
#ifdef _LP64
// only 64 bits is available
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
#else
// only 32 bits is available
clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true);
#endif
#endif #endif
const CServer &server = CConfigFile::getInstance()->getServer(); const CServer &server = CConfigFile::getInstance()->getServer();

19
code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
View file

@ -54,7 +54,9 @@ CMigrateDialog::CMigrateDialog():QDialog()
clientArchGroupBox->setVisible(false); clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true); clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false); clientArch32RadioButton->setChecked(false);
#else #elif defined(Q_OS_WIN32)
// both 32 and 64 bits are working under Windows 64 bits
// check whether OS architecture is 32 or 64 bits // check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS()) if (CConfigFile::has64bitsOS())
{ {
@ -70,6 +72,21 @@ CMigrateDialog::CMigrateDialog():QDialog()
clientArch64RadioButton->setChecked(false); clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true); clientArch32RadioButton->setChecked(true);
} }
#else
// only use the current architecture for Linux
clientArchGroupBox->setVisible(false);
#ifdef _LP64
// only 64 bits is available
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
#else
// only 32 bits is available
clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true);
#endif
#endif #endif
const CServer &server = CConfigFile::getInstance()->getServer(); const CServer &server = CConfigFile::getInstance()->getServer();