Merge remote-tracking branch 'ayasecore/master'
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
if( ELUNA )
|
||||
CU_SET_PATH("CMAKE_MOD_ELUNA_ENGINE_DIR" "${CMAKE_CURRENT_LIST_DIR}")
|
||||
add_subdirectory(lualib)
|
||||
add_subdirectory(LuaEngine)
|
||||
#add_subdirectory(LuaEngine)
|
||||
|
||||
CU_ADD_HOOK(BEFORE_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/before_gs_install.cmake")
|
||||
CU_ADD_HOOK(AFTER_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/after_gs_install.cmake")
|
||||
CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/cmake/after_ws_install.cmake")
|
||||
|
||||
install(FILES "${CMAKE_MOD_ELUNA_ENGINE_DIR}/conf/mod_LuaEngine.conf.dist" DESTINATION ${CONF_DIR})
|
||||
endif()
|
||||
|
||||
|
||||
Submodule LuaEngine updated: 629e50357f...909e514998
28
cmake/after_gs_install.cmake
Normal file
28
cmake/after_gs_install.cmake
Normal file
@@ -0,0 +1,28 @@
|
||||
|
||||
include_directories(
|
||||
${CMAKE_MOD_ELUNA_ENGINE_DIR}
|
||||
${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine
|
||||
${CMAKE_MOD_ELUNA_ENGINE_DIR}/lualib
|
||||
)
|
||||
|
||||
|
||||
add_dependencies(game lualib)
|
||||
target_link_libraries(game lualib)
|
||||
|
||||
if( WIN32 )
|
||||
if ( MSVC )
|
||||
add_custom_command(TARGET game
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/lua_scripts/extensions/"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/lua_scripts/extensions/"
|
||||
)
|
||||
elseif ( MINGW )
|
||||
add_custom_command(TARGET game
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/lua_scripts/extensions/"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/lua_scripts/extensions/"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
install(DIRECTORY extensions DESTINATION "${BIN_DIR}/lua_scripts/")
|
||||
@@ -1,3 +1,10 @@
|
||||
|
||||
include_directories(
|
||||
${CMAKE_MOD_ELUNA_ENGINE_DIR}
|
||||
${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine
|
||||
${CMAKE_MOD_ELUNA_ENGINE_DIR}/lualib
|
||||
)
|
||||
|
||||
if( WIN32 )
|
||||
if ( MSVC )
|
||||
add_custom_command(TARGET worldserver
|
||||
|
||||
16
cmake/before_gs_install.cmake
Normal file
16
cmake/before_gs_install.cmake
Normal file
@@ -0,0 +1,16 @@
|
||||
file(GLOB_RECURSE method_headers ${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/*Methods.h)
|
||||
file(GLOB_RECURSE sources_ElunaFile_CPP ${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/*.cpp )
|
||||
file(GLOB_RECURSE sources_ElunaFile_H ${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/*.h)
|
||||
|
||||
set(game_STAT_SRCS
|
||||
${game_STAT_SRCS}
|
||||
${sources_ElunaFile_H}
|
||||
${sources_ElunaFile_CPP}
|
||||
)
|
||||
|
||||
source_group("LuaEngine\\Methods" FILES ${method_headers})
|
||||
|
||||
source_group("LuaEngine\\Header Files" FILES ${sources_ElunaFile_H})
|
||||
|
||||
source_group("LuaEngine\\Source Files" FILES ${sources_ElunaFile_CPP})
|
||||
|
||||
Reference in New Issue
Block a user