Changed: #842 Prefix all Ryzom binaries by ryzom_
This commit is contained in:
parent
f7dd427ccc
commit
8e4394a92f
18 changed files with 20 additions and 20 deletions
|
@ -21,7 +21,7 @@ IF(WIN32)
|
||||||
PROJECT_LABEL "Library: Client Sheets"
|
PROJECT_LABEL "Library: Client Sheets"
|
||||||
DEBUG_POSTFIX "_d"
|
DEBUG_POSTFIX "_d"
|
||||||
RELEASE_POSTFIX "_r"
|
RELEASE_POSTFIX "_r"
|
||||||
LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt"
|
LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
INSTALL(TARGETS ryzom_clientsheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
INSTALL(TARGETS ryzom_clientsheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||||
|
|
|
@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES VERSION ${NL_VERSION})
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
# SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
|
# SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
|
||||||
# SET_SOURCE_FILES_PROPERTIES(stdgeorges.cpp PROPERTIES COMPILE_FLAGS "/Ycstdgeorges.h")
|
# SET_SOURCE_FILES_PROPERTIES(stdgeorges.cpp PROPERTIES COMPILE_FLAGS "/Ycstdgeorges.h")
|
||||||
SET_TARGET_PROPERTIES(game_share
|
SET_TARGET_PROPERTIES(ryzom_gameshare
|
||||||
PROJECT_LABEL "Library: Game Share"
|
PROJECT_LABEL "Library: Game Share"
|
||||||
DEBUG_POSTFIX "_d"
|
DEBUG_POSTFIX "_d"
|
||||||
RELEASE_POSTFIX "_r"
|
RELEASE_POSTFIX "_r"
|
||||||
|
|
|
@ -22,7 +22,7 @@ ADD_EXECUTABLE(ai_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(ai_service admin_modules
|
TARGET_LINK_LIBRARIES(ai_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
ai_share
|
ai_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
|
|
|
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
ADD_LIBRARY(ai_share STATIC ${SRC})
|
ADD_LIBRARY(ai_share STATIC ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(ai_share game_share
|
TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
${NELMISC_LIBRARY}
|
${NELMISC_LIBRARY}
|
||||||
${NELNET_LIBRARY}
|
${NELNET_LIBRARY}
|
||||||
|
|
|
@ -4,7 +4,7 @@ ADD_EXECUTABLE(backup_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(backup_service admin_modules
|
TARGET_LINK_LIBRARIES(backup_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
${LIBXML2_LIBRARIES}
|
${LIBXML2_LIBRARIES}
|
||||||
|
|
|
@ -6,7 +6,7 @@ ADD_EXECUTABLE(dynamic_scenario_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(dynamic_scenario_service admin_modules
|
TARGET_LINK_LIBRARIES(dynamic_scenario_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
ai_share
|
ai_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
|
|
|
@ -44,7 +44,7 @@ ADD_EXECUTABLE(entities_game_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(entities_game_service admin_modules
|
TARGET_LINK_LIBRARIES(entities_game_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
ai_share
|
ai_share
|
||||||
pd_lib
|
pd_lib
|
||||||
|
|
|
@ -6,7 +6,7 @@ ADD_EXECUTABLE(entity_view_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(entity_view_service admin_modules
|
TARGET_LINK_LIBRARIES(entity_view_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
ai_share
|
ai_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
|
|
|
@ -13,7 +13,7 @@ ADD_EXECUTABLE(frontend_service ${SRC})
|
||||||
|
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(frontend_service admin_modules game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY})
|
TARGET_LINK_LIBRARIES(frontend_service admin_modules ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY})
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET_TARGET_PROPERTIES(frontend_service PROPERTIES
|
SET_TARGET_PROPERTIES(frontend_service PROPERTIES
|
||||||
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
|
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
|
||||||
|
|
|
@ -17,7 +17,7 @@ ADD_EXECUTABLE(general_utilities_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(general_utilities_service admin_modules
|
TARGET_LINK_LIBRARIES(general_utilities_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
ai_share
|
ai_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
|
|
|
@ -4,7 +4,7 @@ ADD_EXECUTABLE(gpm_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(gpm_service admin_modules
|
TARGET_LINK_LIBRARIES(gpm_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
${LIBXML2_LIBRARIES}
|
${LIBXML2_LIBRARIES}
|
||||||
|
|
|
@ -14,7 +14,7 @@ ADD_EXECUTABLE(ios_service ${SRC})
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(ios_service admin_modules
|
TARGET_LINK_LIBRARIES(ios_service admin_modules
|
||||||
pd_lib
|
pd_lib
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
${LIBXML2_LIBRARIES}
|
${LIBXML2_LIBRARIES}
|
||||||
|
|
|
@ -8,7 +8,7 @@ ADD_EXECUTABLE(patchman_service ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(patchman_service admin_modules
|
TARGET_LINK_LIBRARIES(patchman_service admin_modules
|
||||||
game_share
|
ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
${LIBXML2_LIBRARIES}
|
${LIBXML2_LIBRARIES}
|
||||||
|
|
|
@ -4,10 +4,10 @@ SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
|
|
||||||
ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
|
ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
|
||||||
TARGET_LINK_LIBRARIES(patch_gen game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
|
|
||||||
ADD_EXECUTABLE(patch_gen_service ${SERVICE_SRC})
|
ADD_EXECUTABLE(patch_gen_service ${SERVICE_SRC})
|
||||||
TARGET_LINK_LIBRARIES(patch_gen_service game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
|
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
ADD_EXECUTABLE(pdr_util ${SRC})
|
ADD_EXECUTABLE(pdr_util ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(pdr_util game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
INSTALL(TARGETS pdr_util RUNTIME DESTINATION bin COMPONENT tools)
|
INSTALL(TARGETS pdr_util RUNTIME DESTINATION bin COMPONENT tools)
|
||||||
|
|
|
@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/server/src
|
||||||
${CMAKE_SOURCE_DIR}/common/src
|
${CMAKE_SOURCE_DIR}/common/src
|
||||||
${LIBXML2_INCLUDE_DIR}
|
${LIBXML2_INCLUDE_DIR}
|
||||||
${NEL_INCLUDE_DIR})
|
${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(ai_build_wmap game_share
|
TARGET_LINK_LIBRARIES(ai_build_wmap ryzom_gameshare
|
||||||
server_share
|
server_share
|
||||||
ai_share
|
ai_share
|
||||||
${PLATFORM_LINKFLAGS}
|
${PLATFORM_LINKFLAGS}
|
||||||
|
|
|
@ -9,8 +9,8 @@ ADD_EXECUTABLE(sheets_packer ${SRC}
|
||||||
INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR}
|
INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR}
|
||||||
${NEL_INCLUDE_DIR}
|
${NEL_INCLUDE_DIR}
|
||||||
${CMAKE_SOURCE_DIR}/client/src)
|
${CMAKE_SOURCE_DIR}/client/src)
|
||||||
TARGET_LINK_LIBRARIES(sheets_packer client_sheets
|
TARGET_LINK_LIBRARIES(sheets_packer ryzom_clientsheets
|
||||||
game_share
|
ryzom_gameshare
|
||||||
${NELMISC_LIBRARY}
|
${NELMISC_LIBRARY}
|
||||||
${NELGEORGES_LIBRARY}
|
${NELGEORGES_LIBRARY}
|
||||||
${NELNET_LIBRARY}
|
${NELNET_LIBRARY}
|
||||||
|
|
|
@ -5,7 +5,7 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ char_commands.cp
|
||||||
ADD_EXECUTABLE(stats_scan ${SRC})
|
ADD_EXECUTABLE(stats_scan ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(stats_scan game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
INSTALL(TARGETS stats_scan RUNTIME DESTINATION bin COMPONENT tools)
|
INSTALL(TARGETS stats_scan RUNTIME DESTINATION bin COMPONENT tools)
|
||||||
|
|
Loading…
Reference in a new issue