Update Eluna

Eluna-Ports · May 5, 2024 · 09b3416 · 09b3416
1 parent 81fe14f
commit 09b3416
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
@@ -51,28 +51,28 @@ if(NOT BUILD_ELUNA)
   endforeach()
 else()
 # Exclude other cores
-set (EXCLUDE_DIR "LuaEngine/Mangos/")
+set (EXCLUDE_DIR "LuaEngine/methods/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/VMangos/")
+set (EXCLUDE_DIR "LuaEngine/methods/VMangos/")
 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/")
+set (EXCLUDE_DIR "LuaEngine/methods/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/")
+set (EXCLUDE_DIR "LuaEngine/methods/AzerothCore/")
 foreach (TMP_PATH ${LIBRARY_SRCS})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
@@ -150,7 +150,9 @@ if(NOT BUILD_PLAYERBOTS)
     ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
     ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
     ${CMAKE_CURRENT_SOURCE_DIR}/PlayerBot
-    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/methods/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/hooks
     ${CMAKE_SOURCE_DIR}/dep/lualib
     ${CMAKE_BINARY_DIR}
   )
@@ -161,7 +163,9 @@ else()
     ${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot
     ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
     ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
-    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/methods/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/hooks
     ${CMAKE_SOURCE_DIR}/dep/lualib
     ${CMAKE_BINARY_DIR}
   )

diff --git a/src/game/LuaEngine b/src/game/LuaEngine
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
@@ -160,6 +160,9 @@ endif()
 
 # Define BUILD_ELUNA if needed
 if (BUILD_ELUNA)
+  include_directories(
+  ${CMAKE_SOURCE_DIR}/src/game/LuaEngine/hooks
+  )
   add_definitions(-DBUILD_ELUNA -DTBC -DCMANGOS)
   install(FILES ${CMAKE_SOURCE_DIR}/contrib/lua_scripts/masterscript.lua DESTINATION ${BIN_DIR}/lua_scripts)
   install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/game/LuaEngine/extensions DESTINATION ${BIN_DIR}/lua_scripts)