merge
This commit is contained in:
commit
b10efeb9bb
9 changed files with 78 additions and 28 deletions
code/ryzom
|
@ -17,6 +17,7 @@ ENDIF(NOT WIN32 AND NOT APPLE)
|
|||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src )
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
|
||||
SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
|
||||
|
||||
RYZOM_SETUP_PREFIX_PATHS()
|
||||
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
# Supporting modules and libraries.
|
||||
ADD_SUBDIRECTORY(admin_modules)
|
||||
ADD_SUBDIRECTORY(server_share)
|
||||
|
|
28
code/ryzom/server/src/ai_data_service/CMakeLists.txt
Normal file
28
code/ryzom/server/src/ai_data_service/CMakeLists.txt
Normal file
|
@ -0,0 +1,28 @@
|
|||
FILE(GLOB SRC *.cpp *.h)
|
||||
|
||||
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id.cpp))
|
||||
|
||||
ADD_EXECUTABLE(ai_data_service WIN32 ${SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||
TARGET_LINK_LIBRARIES(ai_data_service admin_modules
|
||||
ryzom_gameshare
|
||||
server_share
|
||||
ai_share
|
||||
${PLATFORM_LINKFLAGS}
|
||||
${LIBXML2_LIBRARIES}
|
||||
${MYSQL_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
nelmisc
|
||||
nelnet
|
||||
nelgeorges
|
||||
nelpacs
|
||||
nelligo)
|
||||
|
||||
NL_DEFAULT_PROPS(ai_data_service "Ryzom, Services: AI Data Service (AIDS)")
|
||||
NL_ADD_RUNTIME_FLAGS(ai_data_service)
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
INSTALL(TARGETS ai_data_service RUNTIME DESTINATION sbin COMPONENT services)
|
||||
|
|
@ -47,9 +47,9 @@
|
|||
#include "nel/ligo/primitive.h"
|
||||
|
||||
|
||||
// Game share
|
||||
#include "game_share/bmp4image.h"
|
||||
#include "game_share/continent_container.h"
|
||||
// Server share
|
||||
#include "server_share/bmp4image.h"
|
||||
#include "server_share/continent_container.h"
|
||||
|
||||
|
||||
// AI share
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# Deprecated, no longer used
|
||||
#ADD_SUBDIRECTORY(ai_build_wmap)
|
||||
ADD_SUBDIRECTORY(ai_build_wmap)
|
||||
ADD_SUBDIRECTORY(build_world_packed_col)
|
||||
|
||||
# Not done yet.
|
||||
#admin
|
||||
|
|
|
@ -1,20 +1,19 @@
|
|||
FILE(GLOB SRC *.cpp *.h)
|
||||
FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp)
|
||||
|
||||
ADD_EXECUTABLE(ai_build_wmap ${SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||
|
||||
TARGET_LINK_LIBRARIES(ai_build_wmap
|
||||
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
|
||||
TARGET_LINK_LIBRARIES(ai_build_wmap
|
||||
ryzom_gameshare
|
||||
ryzom_servershare
|
||||
ryzom_aishare
|
||||
${PLATFORM_LINKFLAGS}
|
||||
${LIBXML2_LIBRARIES}
|
||||
nelmisc)
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
NL_DEFAULT_PROPS(ai_build_wmap "Ryzom, Services: Entity View Service (EVS)")
|
||||
NL_DEFAULT_PROPS(ai_build_wmap "Ryzom, Tools, Server: AI Build World Map")
|
||||
NL_ADD_RUNTIME_FLAGS(ai_build_wmap)
|
||||
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
INSTALL(TARGETS ai_build_wmap RUNTIME DESTINATION bin COMPONENT tools)
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp)
|
||||
|
||||
ADD_EXECUTABLE(build_world_packed_col ${SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
|
||||
TARGET_LINK_LIBRARIES(build_world_packed_col
|
||||
ryzom_gameshare
|
||||
server_share
|
||||
ai_share
|
||||
${PLATFORM_LINKFLAGS}
|
||||
${LIBXML2_LIBRARIES}
|
||||
nelmisc
|
||||
nel3d)
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
NL_DEFAULT_PROPS(build_world_packed_col "Ryzom, Tools, Server: Build World Packed Collisions")
|
||||
NL_ADD_RUNTIME_FLAGS(build_world_packed_col)
|
||||
|
||||
IF(WITH_PCH)
|
||||
ADD_NATIVE_PRECOMPILED_HEADER(build_world_packed_col ${CMAKE_CURRENT_SOURCE_DIR}/std_header.h ${CMAKE_CURRENT_SOURCE_DIR}/std_header.cpp)
|
||||
ENDIF(WITH_PCH)
|
||||
|
||||
INSTALL(TARGETS build_world_packed_col RUNTIME DESTINATION bin COMPONENT tools)
|
|
@ -28,10 +28,10 @@
|
|||
#include "nel/misc/debug.h"
|
||||
#include "nel/misc/array_2d.h"
|
||||
//
|
||||
#include "3d/packed_world.h"
|
||||
#include "3d/register_3d.h"
|
||||
#include "nel/3d/packed_world.h"
|
||||
#include "nel/3d/register_3d.h"
|
||||
//
|
||||
#include "r2_share/scenario_entry_points.h"
|
||||
#include "game_share/scenario_entry_points.h"
|
||||
|
||||
|
||||
using namespace NL3D;
|
||||
|
|
|
@ -35,18 +35,18 @@
|
|||
#include "nel/misc/aabbox.h"
|
||||
#include "nel/misc/stream.h"
|
||||
//
|
||||
#include "3d/landscape.h"
|
||||
#include "3d/zone.h"
|
||||
#include "3d/quad_grid.h"
|
||||
#include "3d/event_mouse_listener.h"
|
||||
#include "3d/vertex_buffer.h"
|
||||
#include "3d/material.h"
|
||||
#include "3d/nelu.h"
|
||||
#include "3d/scene_group.h"
|
||||
#include "3d/shape_info.h"
|
||||
#include "3d/packed_zone.h"
|
||||
#include "3d/packed_world.h"
|
||||
#include "3d/texture_file.h"
|
||||
#include "nel/3d/landscape.h"
|
||||
#include "nel/3d/zone.h"
|
||||
#include "nel/3d/quad_grid.h"
|
||||
#include "nel/3d/event_mouse_listener.h"
|
||||
#include "nel/3d/vertex_buffer.h"
|
||||
#include "nel/3d/material.h"
|
||||
#include "nel/3d/nelu.h"
|
||||
#include "nel/3d/scene_group.h"
|
||||
#include "nel/3d/shape_info.h"
|
||||
#include "nel/3d/packed_zone.h"
|
||||
#include "nel/3d/packed_world.h"
|
||||
#include "nel/3d/texture_file.h"
|
||||
//
|
||||
using namespace NL3D;
|
||||
using namespace NLMISC;
|
||||
|
|
Loading…
Reference in a new issue