aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 04:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-10 20:47:56 +02:00
commit 1f95d69a81
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/tools/client/ryzom_installer/CMakeLists.txt
View file

@ -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})

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

@ -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();

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

@ -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();