From d9d2195c858bcffa41b2c3367d2530d2e2db8fbd Mon Sep 17 00:00:00 2001 From: Niam5 Date: Thu, 27 Jul 2023 21:02:06 -0500 Subject: [PATCH] Update Eluna files for repo reorg -Update submodule --- src/game/CMakeLists.txt | 23 +++++++++++++++++++++++ src/game/LuaEngine | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index d2ccae1bf2..77b3cee150 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -50,6 +50,28 @@ if(NOT BUILD_ELUNA) endif () endforeach() else() +# Exclude other cores +set (EXCLUDE_DIR "LuaEngine/Mangos/") +foreach (TMP_PATH ${LIBRARY_SRCS}) + string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND) + if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1) + list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH}) + endif () +endforeach() +set (EXCLUDE_DIR "LuaEngine/TrinityCore/") +foreach (TMP_PATH ${LIBRARY_SRCS}) + string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND) + if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1) + list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH}) + endif () +endforeach() +set (EXCLUDE_DIR "LuaEngine/AzerothCore/") +foreach (TMP_PATH ${LIBRARY_SRCS}) + string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND) + if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1) + list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH}) + endif () +endforeach() add_definitions(-DBUILD_ELUNA -DCMANGOS -DCLASSIC) endif() @@ -109,6 +131,7 @@ set(ADDITIONAL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP ${CMAKE_CURRENT_SOURCE_DIR}/PlayerBot + ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/CMangos ${CMAKE_SOURCE_DIR}/dep/lualib ${CMAKE_BINARY_DIR} ) diff --git a/src/game/LuaEngine b/src/game/LuaEngine index e093ff173d..4e5f51a552 160000 --- a/src/game/LuaEngine +++ b/src/game/LuaEngine @@ -1 +1 @@ -Subproject commit e093ff173dc5afbe6f90226d23268cb34c589846 +Subproject commit 4e5f51a5526fb0e8cdf2cccc4ca041ddd3ebc385