mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-23 17:38:44 +00:00
Merge
This commit is contained in:
commit
4aaf3863de
4 changed files with 44 additions and 7 deletions
|
@ -117,5 +117,6 @@ IF(WITH_TOOLS)
|
|||
ENDIF(WITH_TOOLS)
|
||||
|
||||
IF(WITH_SERVER)
|
||||
FIND_PACKAGE(MySQL)
|
||||
ADD_SUBDIRECTORY(server)
|
||||
ENDIF(WITH_SERVER)
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
ADD_SUBDIRECTORY(admin_modules)
|
||||
ADD_SUBDIRECTORY(server_share)
|
||||
|
||||
ADD_SUBDIRECTORY(frontend_service)
|
||||
|
||||
# Still working on this.
|
||||
#ADD_SUBDIRECTORY(entities_game_service)
|
||||
ADD_SUBDIRECTORY(entities_game_service)
|
||||
|
||||
#ags_test
|
||||
#ai_data_service
|
||||
|
|
|
@ -18,20 +18,30 @@ FILE(GLOB SRC *.cpp *.h
|
|||
pvp_manager/pvp_faction_reward_manager/*.h pvp_manager/pvp_faction_reward_manager/*.cpp
|
||||
shop_type/*.h shop_type/*.cpp
|
||||
stables/*.h stables/*.cpp
|
||||
team_manager/*.h team_manager/*.cpp
|
||||
weather/*.h weather/*.cpp)
|
||||
team_manager/*.h team_manager/*.cpp)
|
||||
|
||||
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/egs_static_continent.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/egs_static_continent.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shutdown_handler.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shutdown_handler.h)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shutdown_handler.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/combat_bleed_effect.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/combat_bleed_effect.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/combat_stun_effect.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/combat_stun_effect.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/magic_action_cure.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/magic_action_debuff.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/magic_action_hot.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/slow_move_effect.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/slow_move_effect.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.h)
|
||||
|
||||
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})
|
||||
TARGET_LINK_LIBRARIES(entities_game_service admin_modules game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY})
|
||||
TARGET_LINK_LIBRARIES(entities_game_service admin_modules game_share server_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY})
|
||||
|
||||
IF(WIN32)
|
||||
SET_TARGET_PROPERTIES(entities_game_service PROPERTIES
|
||||
|
|
27
code/ryzom/server/src/server_share/CMakeLists.txt
Normal file
27
code/ryzom/server/src/server_share/CMakeLists.txt
Normal file
|
@ -0,0 +1,27 @@
|
|||
FILE(GLOB SRC *.cpp *.h)
|
||||
|
||||
# Filter out the source files not actually compiled.
|
||||
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ admin_modules.cpp)
|
||||
|
||||
IF(WIN32)
|
||||
ADD_LIBRARY(server_share STATIC ${SRC})
|
||||
ELSE(WIN32)
|
||||
ADD_LIBRARY(server_share SHARED ${SRC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||
TARGET_LINK_LIBRARIES(server_share ${NELMISC_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
SET_TARGET_PROPERTIES(server_share PROPERTIES VERSION ${NL_VERSION})
|
||||
|
||||
IF(WIN32)
|
||||
SET_TARGET_PROPERTIES(server_share
|
||||
PROJECT_LABEL "Library: Server Share"
|
||||
DEBUG_POSTFIX "_d"
|
||||
RELEASE_POSTFIX "_r"
|
||||
LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
|
||||
LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
|
||||
ENDIF(WIN32)
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
INSTALL(TARGETS server_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
Loading…
Reference in a new issue