From ff4c458f6d2511afbbcebcc2998c775c922b9c5a Mon Sep 17 00:00:00 2001 From: SIELA1915 Date: Mon, 1 Feb 2016 16:04:21 +0100 Subject: [PATCH] changed the last missing --- code/ryzom/client/unix/CMakeLists.txt | 6 +- .../client/unix/khanat_client.desktop.in | 16 +++ code/ryzom/client/unix/khanat_client.xpm | 107 ++++++++++++++++++ .../client/client_patcher/CMakeLists.txt | 14 +-- 4 files changed, 133 insertions(+), 10 deletions(-) create mode 100644 code/ryzom/client/unix/khanat_client.desktop.in create mode 100644 code/ryzom/client/unix/khanat_client.xpm diff --git a/code/ryzom/client/unix/CMakeLists.txt b/code/ryzom/client/unix/CMakeLists.txt index 2bcd7ab84..1dbe48949 100644 --- a/code/ryzom/client/unix/CMakeLists.txt +++ b/code/ryzom/client/unix/CMakeLists.txt @@ -1,9 +1,9 @@ IF(WITH_UNIX_STRUCTURE) - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/khanat_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/khanat_client.desktop") - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop" DESTINATION share/applications) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/khanat_client.desktop" DESTINATION share/applications) INSTALL(FILES khanat_client.png DESTINATION share/pixmaps) - INSTALL(FILES ryzom_client.xpm DESTINATION share/pixmaps) + INSTALL(FILES khanat_client.xpm DESTINATION share/pixmaps) INSTALL(FILES khanat_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png) INSTALL(FILES khanat_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${RYZOM_CLIENT_ICON}.png) INSTALL(FILES khanat_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${RYZOM_CLIENT_ICON}.png) diff --git a/code/ryzom/client/unix/khanat_client.desktop.in b/code/ryzom/client/unix/khanat_client.desktop.in new file mode 100644 index 000000000..9941fa563 --- /dev/null +++ b/code/ryzom/client/unix/khanat_client.desktop.in @@ -0,0 +1,16 @@ +[Desktop Entry] +Version=0.1 +Name=Khanat +Name[ru]=Ризом +Type=Application +GenericName=Game client +Comment=Khanat client +Comment[fr_FR]=Client Khanat +TryExec=${RYZOM_GAMES_PREFIX}/khanat_client +Exec=${RYZOM_GAMES_PREFIX}/khanat_client +Icon=${RYZOM_CLIENT_ICON} +Terminal=false +Hidden=false +Categories=Game;RolePlaying; +StartupWMClass=khanat_client +X-AppInstall-Package=khanat-client diff --git a/code/ryzom/client/unix/khanat_client.xpm b/code/ryzom/client/unix/khanat_client.xpm new file mode 100644 index 000000000..e37a7617b --- /dev/null +++ b/code/ryzom/client/unix/khanat_client.xpm @@ -0,0 +1,107 @@ +/* XPM */ +static char *khanat_client[] = { +/* columns rows colors chars-per-pixel */ +"32 32 69 1 ", +" c #000065", +". c #00006D", +"X c #000072", +"o c #0E0673", +"O c #0F0873", +"+ c #02007A", +"@ c #0C047A", +"# c #110773", +"$ c #110973", +"% c #10077C", +"& c #120A7B", +"* c #171174", +"= c #1A1574", +"- c #1E1A75", +"; c #17117B", +": c #1A147A", +"> c #1E197D", +", c #211E75", +"< c #211D7E", +"1 c #242277", +"2 c #282577", +"3 c #252278", +"4 c #302F7A", +"5 c #36347B", +"6 c #38377C", +"7 c #3E3C7E", +"8 c #120983", +"9 c #221D84", +"0 c #444281", +"q c #484781", +"w c #4E4D85", +"e c #545387", +"r c #575689", +"t c #5C5B8B", +"y c #605F8D", +"u c #63628E", +"i c #6B6A93", +"p c #727096", +"a c #757498", +"s c #79779B", +"d c #7C7B9D", +"f c #81819F", +"g c #8383A1", +"h c #8C8CA7", +"j c #8E8DA8", +"k c #908FAA", +"l c #9696AE", +"z c #9E9EB4", +"x c #A3A2B7", +"c c #A5A5B9", +"v c #ABABBD", +"b c #B4B4C3", +"n c #BABAC7", +"m c #BBBBC9", +"M c #C2C2CE", +"N c #C6C6D1", +"B c #CBCBD5", +"V c #CFCFD8", +"C c #D1CFD9", +"Z c #D3D3DC", +"A c #DADAE0", +"S c #E2E0E7", +"D c #E3E3E8", +"F c #EAEAEE", +"G c #EEEEF2", +"H c #F4F4F6", +"J c #F7F7F9", +"K c #FEFEFE", +"L c None", +/* pixels */ +"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL", +"LLLLLLLLLLLO&#LLLL*LLLLLLLLLLLLL", +"LLLLLLLLLLL#88OLLL91LLLLLLLLLLLL", +"LLLLLLLLLLL#&OLLLLX LLL:#LLLLLLL", +"LLLLLLLLLLLLLO#OXwsie .+>#LLLLLL", +"LLLLL###LLLL##:OXsLHZvi.X1LLLLLL", +"LLLLLO8OLLoO&o*OXgLLLJJb0LLLLLLL", +"LLLLLL&OL*&&#o*o.gJJJLLLZuLL#LLL", +"LLLLLLLL*:-=#O*OXgLJJJJJLZr.9oLL", +"LLLLLLLLX..Xo=*O.hLJJJLLLLm1.>oL", +"LLLLLLLXuhfiXX1#.gLJJLFnMJLl.=LL", +"LLL#LLL+eBLJx#.,XgLJJLN.tGLB7LLL", +"L#O&OL#;.0bLLm0..gLJJLN.eFLFgLLL", +"LL#8#OO*o..lJLZu gLLLLZ.yGLJcLLL", +"LLL##L#X.sDLFsubvvvh.tGLLnXX=", +"LLLLLL##Oo-#.tDLJa .....tHLLM=X>", +"LLLLLLO###-XXzJLntpassu.tGLLM*X:", +"LLLLLL#&#-X*vLLc.sLJJLB.tGLLb.X=", +"LLLLLL#*-.2bLLz..hLLJLB.tFLJzLLL", +"LLL&#o#:.7NLJhX..hJJJLM.tFLDsLLL", +"LL#&8#L.wVLHg.X-.gLJJLB.eGLM:.LL", +"LLLL#LLXegfuX.,o.gLJJLGMMLJa.<#L", +"LLLLLLLLXX..X=*o.gLJJJJLLLxX+*LL", +"LLLLLLLLL+#**o*o.gLJJJJLLn5.>oLL", +"LLLLLLL#L-=&#O*O.gLJJLLJv7LLLLLL", +"LLLLLL#8OLLo&&*O.hLLLJSgXLLLLLLL", +"LLLLL#8##LLLLo*&+aFVng7.+-LLLLLL", +"LLLLLOLLLLLLLO#LX5w6LL.+=#LLLLLL", +"LLLLLLLLLLLLO&#LLL+.LLL=LLLLLLLL", +"LLLLLLLLLLLLO8#LLL:,LLLLLLLLLLLL", +"LLLLLLLLLLLLO#LLLLLLLLLLLLLLLLLL", +"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL" +}; diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index 0b32a9867..fbecf551c 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -12,7 +12,7 @@ FILE(GLOB SRC main.cpp # always enable custom patch server ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DRZ_USE_CUSTOM_PATCH_SERVER) -ADD_EXECUTABLE(ryzom_client_patcher ${SRC}) +ADD_EXECUTABLE(khanat_client_patcher ${SRC}) INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/ryzom/client/src ) -TARGET_LINK_LIBRARIES(ryzom_client_patcher +TARGET_LINK_LIBRARIES(khanat_client_patcher nelmisc nelnet ryzom_gameshare @@ -29,16 +29,16 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher IF(APPLE) FIND_LIBRARY(FOUNDATION_LIBRARY Foundation) - TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY}) + TARGET_LINK_LIBRARIES(khanat_client_patcher ${FOUNDATION_LIBRARY}) ENDIF(APPLE) ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP) -NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher") -NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher) +NL_DEFAULT_PROPS(khanat_client_patcher "Khanat, Tools: Khanat Client Patcher") +NL_ADD_RUNTIME_FLAGS(khanat_client_patcher) IF(WITH_PCH) - ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp) + ADD_NATIVE_PRECOMPILED_HEADER(khanat_client_patcher ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp) ENDIF(WITH_PCH) -INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client) +INSTALL(TARGETS khanat_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client)