From f9e5950126e921840f87c6055d050cffdfbf6236 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 17 Jul 2010 17:54:43 +0200 Subject: [PATCH] Changed: #842 Added new files for X11 applications --- code/ryzom/client/CMakeLists.txt | 6 ++++++ code/ryzom/client/unix/CMakeLists.txt | 4 ++++ code/ryzom/client/unix/ryzom.desktop.in | 11 +++++++++++ code/ryzom/client/unix/ryzom.png | Bin 0 -> 6128 bytes code/ryzom/common/CMakeLists.txt | 9 +++++++++ 5 files changed, 30 insertions(+) create mode 100644 code/ryzom/client/unix/CMakeLists.txt create mode 100644 code/ryzom/client/unix/ryzom.desktop.in create mode 100644 code/ryzom/client/unix/ryzom.png diff --git a/code/ryzom/client/CMakeLists.txt b/code/ryzom/client/CMakeLists.txt index 4b7537b55..642244536 100644 --- a/code/ryzom/client/CMakeLists.txt +++ b/code/ryzom/client/CMakeLists.txt @@ -1 +1,7 @@ ADD_SUBDIRECTORY(src) + +IF(UNIX AND NOT APPLE) + ADD_SUBDIRECTORY(unix) +ENDIF(UNIX AND NOT APPLE) + +INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX}) diff --git a/code/ryzom/client/unix/CMakeLists.txt b/code/ryzom/client/unix/CMakeLists.txt new file mode 100644 index 000000000..df17996fe --- /dev/null +++ b/code/ryzom/client/unix/CMakeLists.txt @@ -0,0 +1,4 @@ +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom.desktop") + +INSTALL(FILES ryzom.png DESTINATION share/pixmaps) +INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom.desktop" DESTINATION share/applications) diff --git a/code/ryzom/client/unix/ryzom.desktop.in b/code/ryzom/client/unix/ryzom.desktop.in new file mode 100644 index 000000000..da04de87c --- /dev/null +++ b/code/ryzom/client/unix/ryzom.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=Ryzom +Type=Application +GenericName=ryzom +Comment=Ryzom MMORPG client +Exec=${RYZOM_BIN_PREFIX}/ryzom_client +Icon=ryzom +Terminal=false +Hidden=false +Categories=Game;RolePlaying; diff --git a/code/ryzom/client/unix/ryzom.png b/code/ryzom/client/unix/ryzom.png new file mode 100644 index 0000000000000000000000000000000000000000..43aae082f1e401220e2659bb831b117c5687827c GIT binary patch literal 6128 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 literal 0 HcmV?d00001 diff --git a/code/ryzom/common/CMakeLists.txt b/code/ryzom/common/CMakeLists.txt index 4b7537b55..dbf1c937d 100644 --- a/code/ryzom/common/CMakeLists.txt +++ b/code/ryzom/common/CMakeLists.txt @@ -1 +1,10 @@ ADD_SUBDIRECTORY(src) + +#ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/share/data_common.bnp" +# COMMAND bnp_make -p ${CMAKE_CURRENT_SOURCE_DIR}/data_common ${CMAKE_BINARY_DIR}/share > /dev/null) + +#ADD_CUSTOM_TARGET(data_common ALL +# DEPENDS "${CMAKE_BINARY_DIR}/share/data_common.bnp") + +#INSTALL(TARGETS data_common ARCHIVE DESTINATION ${RYZOM_SHARE_PREFIX}/data) +#INSTALL(FILES "${CMAKE_BINARY_DIR}/share/data_common.bnp" DESTINATION "${RYZOM_SHARE_PREFIX}/data")