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

Changed: Disable architecture choice under OS X (always 64 bits)

Browse source
This commit is contained in:
kervala 2016-10-10 20:47:15 +02:00
parent 0420edd920
commit ad23c46fe8
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,17 +35,28 @@ CInstallDialog::CInstallDialog():QDialog()
// update default destination // update default destination
onDestinationDefaultButtonClicked(); onDestinationDefaultButtonClicked();
#ifdef Q_OS_MAC
// check whether OS architecture is 32 or 64 bits // check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS()) if (CConfigFile::has64bitsOS())
{ {
// 64 bits enbabled by default
clientArchGroupBox->setVisible(true); clientArchGroupBox->setVisible(true);
clientArch64RadioButton->setChecked(true); clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
} }
else else
{ {
// only 32 bits is available
clientArchGroupBox->setVisible(false); clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true); clientArch32RadioButton->setChecked(true);
} }
#else
// only 64 bits for OS X
clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
#endif
const CServer &server = CConfigFile::getInstance()->getServer(); const CServer &server = CConfigFile::getInstance()->getServer();

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

@ -49,17 +49,28 @@ CMigrateDialog::CMigrateDialog():QDialog()
// update default destination // update default destination
onDestinationDefaultButtonClicked(); onDestinationDefaultButtonClicked();
#ifdef Q_OS_MAC
// check whether OS architecture is 32 or 64 bits // check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS()) if (CConfigFile::has64bitsOS())
{ {
// 64 bits enbabled by default
clientArchGroupBox->setVisible(true); clientArchGroupBox->setVisible(true);
clientArch64RadioButton->setChecked(true); clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
} }
else else
{ {
// only 32 bits is available
clientArchGroupBox->setVisible(false); clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true); clientArch32RadioButton->setChecked(true);
} }
#else
// only 64 bits for OS X
clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
#endif
const CServer &server = CConfigFile::getInstance()->getServer(); const CServer &server = CConfigFile::getInstance()->getServer();