Merge
This commit is contained in:
commit
346920f1fd
2 changed files with 28 additions and 1 deletions
|
@ -1,7 +1,26 @@
|
||||||
FILE(GLOB SRC *.cpp time_weather_season/*.cpp)
|
FILE(GLOB SRC *.cpp time_weather_season/*.cpp)
|
||||||
FILE(GLOB PRIV_H *.h time_weather_season/*.h)
|
FILE(GLOB PRIV_H *.h time_weather_season/*.h)
|
||||||
|
|
||||||
SOURCE_GROUP(headers FILES ${PRIV_H})
|
FILE(GLOB R2
|
||||||
|
dms.h dms.cpp
|
||||||
|
scenario.h scenario.cpp
|
||||||
|
user_connection_mgr.h user_connection_mgr.cpp
|
||||||
|
object.h object.cpp
|
||||||
|
server_animation_module.h server_animation_module.cpp
|
||||||
|
server_admin_module.h server_admin_module.cpp
|
||||||
|
server_edition_module.h server_edition_module.cpp
|
||||||
|
string_mgr_module.h string_mgr_module.cpp
|
||||||
|
scenario_entry_points.h scenario_entry_points.cpp
|
||||||
|
small_string_manager.h small_string_manager.cpp
|
||||||
|
ai_wrapper.h ai_wrapper.cpp
|
||||||
|
r2_*.h r2_*.cpp
|
||||||
|
ring_*.h ring_*.cpp)
|
||||||
|
|
||||||
|
LIST(REMOVE_ITEM SRC R2)
|
||||||
|
LIST(REMOVE_ITEM PRIV_H R2)
|
||||||
|
|
||||||
|
SOURCE_GROUP("" FILES ${SRC} ${PRIV_H})
|
||||||
|
SOURCE_GROUP("R2" FILES ${R2})
|
||||||
|
|
||||||
# Filter out the source files not actually compiled.
|
# Filter out the source files not actually compiled.
|
||||||
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
|
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
FILE(GLOB SRC *.cpp *.h)
|
FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
|
FILE(GLOB R2
|
||||||
|
r2_*.h r2_*.cpp)
|
||||||
|
|
||||||
|
LIST(REMOVE_ITEM SRC R2)
|
||||||
|
|
||||||
|
SOURCE_GROUP("" FILES ${SRC})
|
||||||
|
SOURCE_GROUP("R2" FILES ${R2})
|
||||||
|
|
||||||
NL_TARGET_LIB(ryzom_servershare ${SRC})
|
NL_TARGET_LIB(ryzom_servershare ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||||
|
|
Loading…
Reference in a new issue