From 2b4058ed957fd610b08ea35e00111cf4d848507d Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 Oct 2016 20:47:56 +0200 Subject: [PATCH] Merge with develop --- .../ryzom/tools/client/ryzom_installer/CMakeLists.txt | 2 +- .../client/ryzom_installer/src/installdialog.cpp | 11 +++++++++++ .../client/ryzom_installer/src/migratedialog.cpp | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt index c66e35b61..b76b0e20d 100644 --- a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt +++ b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt @@ -60,7 +60,7 @@ ENDIF() ADD_EXECUTABLE(ryzom_installer_qt WIN32 MACOSX_BUNDLE ${SRC} ${CLIENT_INSTALL_MOC_SRC} ${CLIENT_INSTALL_UI_HDRS} ${CLIENT_INSTALL_RC_SRCS} ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_BASE_TRANS} ${CLIENT_INSTALL_QM}) IF(APPLE) - SET_TARGET_PROPERTIES(ryzom_installer_qt PROPERTIES OUTPUT_NAME RyzomInstaller) + SET_TARGET_PROPERTIES(ryzom_installer_qt PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME}) SET_TARGET_PROPERTIES(ryzom_installer_qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist) ADD_CUSTOM_COMMAND(TARGET ryzom_installer_qt PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR}) ADD_CUSTOM_COMMAND(TARGET ryzom_installer_qt POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR}) diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index 7198962ac..6ec2a49ed 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -35,17 +35,28 @@ CInstallDialog::CInstallDialog():QDialog() // update default destination onDestinationDefaultButtonClicked(); +#ifdef Q_OS_MAC // check whether OS architecture is 32 or 64 bits if (CConfigFile::has64bitsOS()) { + // 64 bits enbabled by default clientArchGroupBox->setVisible(true); clientArch64RadioButton->setChecked(true); + clientArch32RadioButton->setChecked(false); } else { + // only 32 bits is available clientArchGroupBox->setVisible(false); + clientArch64RadioButton->setChecked(false); 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(); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index 22e4f0ad2..f60abd95c 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -49,17 +49,28 @@ CMigrateDialog::CMigrateDialog():QDialog() // update default destination onDestinationDefaultButtonClicked(); +#ifdef Q_OS_MAC // check whether OS architecture is 32 or 64 bits if (CConfigFile::has64bitsOS()) { + // 64 bits enbabled by default clientArchGroupBox->setVisible(true); clientArch64RadioButton->setChecked(true); + clientArch32RadioButton->setChecked(false); } else { + // only 32 bits is available clientArchGroupBox->setVisible(false); + clientArch64RadioButton->setChecked(false); 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();