From fbc25847e185a4ecf18731404a2152023ba354da Mon Sep 17 00:00:00 2001 From: SIELA1915 Date: Tue, 9 Feb 2016 23:09:12 +0100 Subject: [PATCH] corrections for Khanatising the code --- code/CMakeModules/ConfigureChecks.cmake | 2 +- code/ryzom/client/src/CMakeLists.txt | 66 +++++++++---------- code/ryzom/client/src/client.rc | 4 +- .../client_config_qt/client_config_dialog.cpp | 8 +-- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/code/CMakeModules/ConfigureChecks.cmake b/code/CMakeModules/ConfigureChecks.cmake index 3929d65c9..20a53e8b0 100644 --- a/code/CMakeModules/ConfigureChecks.cmake +++ b/code/CMakeModules/ConfigureChecks.cmake @@ -47,7 +47,7 @@ MACRO(NL_CONFIGURE_CHECKS) SET(COPYRIGHT "${YEAR} ${AUTHOR}") IF(NOT RYZOM_CLIENT_ICON) - SET(RYZOM_CLIENT_ICON "ryzom_client") + SET(RYZOM_CLIENT_ICON "khanat_client") ENDIF() CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index bb94560a5..4aa4199e1 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -65,58 +65,58 @@ IF(WITH_RYZOM_CLIENT) SET(MAC_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/ryzom/client/macosx) ENDIF() - ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2}) + ADD_EXECUTABLE(khanat_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2}) IF(APPLE) - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME}) - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist) - ADD_CUSTOM_COMMAND(TARGET ryzom_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR}) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR}) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/khanat.icns ${RYZOM_RESOURCES_DIR}) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR}) + SET_TARGET_PROPERTIES(khanat_client PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME}) + SET_TARGET_PROPERTIES(khanat_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist) + ADD_CUSTOM_COMMAND(TARGET khanat_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/khanat.icns ${RYZOM_RESOURCES_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR}) # remove any present installscript_osx.vdf before signing - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND rm -f ${RYZOM_OUTPUT_DIR}/installscript_osx.vdf) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND rm -f ${RYZOM_OUTPUT_DIR}/installscript_osx.vdf) IF(RYZOM_DATA_DIR) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR}) ENDIF() IF(TARGET crash_report) - ADD_DEPENDENCIES(ryzom_client crash_report) + ADD_DEPENDENCIES(khanat_client crash_report) # copy crash_report to bundle - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crash_report ${RYZOM_CONTENTS_DIR}/MacOS/CrashReport) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crash_report ${RYZOM_CONTENTS_DIR}/MacOS/CrashReport) IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/CrashReport" COMMENT "Signing CrashReport executable...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/CrashReport" COMMENT "Signing CrashReport executable...") ENDIF() ENDIF() - IF(TARGET ryzom_client_patcher) - ADD_DEPENDENCIES(ryzom_client ryzom_client_patcher) + IF(TARGET khanat_client_patcher) + ADD_DEPENDENCIES(khanat_client khanat_client_patcher) - # copy ryzom_client_patcher to bundle - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_client_patcher ${RYZOM_CONTENTS_DIR}/MacOS/RyzomClientPatcher) + # copy khanat_client_patcher to bundle + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/khanat_client_patcher ${RYZOM_CONTENTS_DIR}/MacOS/KhanatClientPatcher) IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomClientPatcher" COMMENT "Signing RyzomClientPatcher executable...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/KhanatClientPatcher" COMMENT "Signing KhanatClientPatcher executable...") ENDIF() ENDIF() IF(TARGET ryzom_configuration_qt) - ADD_DEPENDENCIES(ryzom_client ryzom_configuration_qt) + ADD_DEPENDENCIES(khanat_client ryzom_configuration_qt) # copy ryzom_configuration_qt to bundle - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_configuration_qt ${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_configuration_qt ${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration) IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration" COMMENT "Signing RyzomConfiguration executable...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration" COMMENT "Signing RyzomConfiguration executable...") ENDIF() ENDIF() IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_OUTPUT_DIR}" COMMENT "Signing Ryzom bundle...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_OUTPUT_DIR}" COMMENT "Signing Ryzom bundle...") ENDIF() ENDIF() @@ -129,7 +129,7 @@ IF(WITH_RYZOM_CLIENT) ${ZLIB_INCLUDE_DIR} ) - TARGET_LINK_LIBRARIES(ryzom_client + TARGET_LINK_LIBRARIES(khanat_client nelmisc nelnet nelligo @@ -149,40 +149,40 @@ IF(WITH_RYZOM_CLIENT) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(NOT APPLE AND NOT WIN32) - TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES}) + TARGET_LINK_LIBRARIES(khanat_client ${X11_LIBRARIES}) ENDIF() IF(APPLE) FIND_LIBRARY(FOUNDATION_LIBRARY Foundation) - TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_LIBRARY}) + TARGET_LINK_LIBRARIES(khanat_client ${FOUNDATION_LIBRARY}) ENDIF() ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS}) - NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client") - NL_ADD_RUNTIME_FLAGS(ryzom_client) + NL_DEFAULT_PROPS(khanat_client "Khanat, Client: Khanat Client") + NL_ADD_RUNTIME_FLAGS(khanat_client) IF(FINAL_VERSION) - NL_ADD_LIB_SUFFIX(ryzom_client) + NL_ADD_LIB_SUFFIX(khanat_client) ELSE() IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r") + SET_TARGET_PROPERTIES(khanat_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r") ELSE() - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES POSTFIX "_dev") + SET_TARGET_PROPERTIES(khanat_client PROPERTIES POSTFIX "_dev") ENDIF() ENDIF() IF(WITH_RYZOM_CLIENT_UAC) IF(CMAKE_GENERATOR MATCHES "Visual Studio") - SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'") + SET_PROPERTY(TARGET khanat_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'") ELSEIF(CMAKE_GENERATOR MATCHES "NMake Makefiles") - SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"") + SET_PROPERTY(TARGET khanat_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"") ENDIF() ENDIF() IF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS)) - ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) + ADD_NATIVE_PRECOMPILED_HEADER(khanat_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF() - INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) + INSTALL(TARGETS khanat_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) ENDIF() diff --git a/code/ryzom/client/src/client.rc b/code/ryzom/client/src/client.rc index 1bf537a1f..ab2bb70a2 100644 --- a/code/ryzom/client/src/client.rc +++ b/code/ryzom/client/src/client.rc @@ -193,9 +193,9 @@ BEGIN #endif #else #ifdef _DEBUG - VALUE "OriginalFilename", "ryzom_client_dev_d.exe" + VALUE "OriginalFilename", "kkhanat_client_dev_d.exe" #else - VALUE "OriginalFilename", "ryzom_client_dev_r.exe" + VALUE "OriginalFilename", "khanat_client_dev_r.exe" #endif #endif VALUE "ProductName", "Ryzom Core" diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp index bfa9bbc58..e29c9a4cc 100644 --- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp +++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp @@ -146,13 +146,13 @@ void CClientConfigDialog::onClickPlay() bool started = false; #ifdef Q_OS_WIN32 - started = QProcess::startDetached( "ryzom_client_r.exe" ); + started = QProcess::startDetached( "khanat_client_r.exe" ); if( !started ) - QProcess::startDetached( "ryzom_client_d.exe" ); + QProcess::startDetached( "khanat_client_d.exe" ); #elif defined(Q_OS_MAC) - started = QProcess::startDetached( "./Ryzom.app" ); + started = QProcess::startDetached( "./Khanat.app" ); #else - started = QProcess::startDetached( "./ryzom_client" ); + started = QProcess::startDetached( "./khanat_client" ); #endif onClickOK();