Update Eluna

Eluna-Ports · Apr 29, 2024 · a4fe06a · a4fe06a
1 parent 414d634
commit a4fe06a
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)
@@ -151,7 +151,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}
  )
@@ -162,7 +164,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
@@ -159,6 +159,9 @@ endif()
 
 # Define BUILD_ELUNA if needed
 if (BUILD_ELUNA)
+ include_directories(
+ ${CMAKE_SOURCE_DIR}/src/game/LuaEngine/hooks
+ )
  add_definitions(-DBUILD_ELUNA -DCLASSIC -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)