From 016e075fa5f1958a59798ea21ef7a40a7262d903 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 13 Oct 2016 19:50:11 +0200
Subject: [PATCH] Changed: Only install same client arch as Installer under
 Linux

--HG--
branch : develop
---
 .../ryzom_installer/src/installdialog.cpp     | 21 +++++++++++++++++--
 .../ryzom_installer/src/migratedialog.cpp     | 19 ++++++++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
index 411602b0b..4ec1849a6 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
@@ -40,7 +40,9 @@ CInstallDialog::CInstallDialog():QDialog()
 	clientArchGroupBox->setVisible(false);
 	clientArch64RadioButton->setChecked(true);
 	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
 	if (CConfigFile::has64bitsOS())
 	{
@@ -55,7 +57,22 @@ CInstallDialog::CInstallDialog():QDialog()
 		clientArchGroupBox->setVisible(false);
 		clientArch64RadioButton->setChecked(false);
 		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
 
 	const CServer &server = CConfigFile::getInstance()->getServer();
diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
index d3e9739b4..2315d38ec 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
@@ -54,7 +54,9 @@ CMigrateDialog::CMigrateDialog():QDialog()
 	clientArchGroupBox->setVisible(false);
 	clientArch64RadioButton->setChecked(true);
 	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
 	if (CConfigFile::has64bitsOS())
 	{
@@ -70,6 +72,21 @@ CMigrateDialog::CMigrateDialog():QDialog()
 		clientArch64RadioButton->setChecked(false);
 		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
 
 	const CServer &server = CConfigFile::getInstance()->getServer();