Merge with develop
This commit is contained in:
parent
8f33264131
commit
e67d86eeda
2 changed files with 2 additions and 1 deletions
|
@ -12,5 +12,5 @@ IF(WITH_UNIX_STRUCTURE)
|
|||
INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
ELSE()
|
||||
# in case of local client, only copy 48x48 icon
|
||||
INSTALL(FILES ryzom_48x48.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES ryzom_128x128.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
ENDIF()
|
||||
|
|
|
@ -11,5 +11,6 @@ chmod +x "$ROOTPATH/ryzom_client"
|
|||
chmod +x "$ROOTPATH/crash_report"
|
||||
chmod +x "$ROOTPATH/ryzom_client_patcher"
|
||||
chmod +x "$ROOTPATH/ryzom_configuration_qt"
|
||||
chmod +x "$ROOTPATH/ryzom_installer_qt"
|
||||
|
||||
exit 0
|
||||
|
|
Loading…
Reference in a new issue