Merge pull request #14 from Niam5/eluna-support

Updated Eluna and lualib dependancy

.github/workflows/dev-release.yml

@@ -21,7 +21,10 @@ jobs:
 
     steps:
     #git checkout
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: true
 
     - name: windows dependencies
       #Sets versions for ACE/TBB

.github/workflows/vmangos.yml

@@ -49,7 +49,10 @@ jobs:
     steps:
 
     #git checkout
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: true
 
     #before install dependencies
     - name: ubuntu dependencies

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/modules/Eluna"]
+	path = src/modules/Eluna
+	url = https://github.com/ElunaLuaEngine/Eluna.git

dep/lualib/CMakeLists.txt

@@ -1,71 +1,26 @@
-#
-# Copyright (C) 2010 - 2014 Eluna Lua Engine <http://emudevs.com/>
-# This program is free software licensed under GPL version 3
-# Please see the included DOCS/LICENSE.md for more information
-#
+set(LUA_VERSION "lua52" CACHE STRING "Lua version to use")
+set_property(CACHE LUA_VERSION PROPERTY STRINGS luajit lua51 lua52 lua53 lua54)
+MESSAGE(STATUS "Lua version: ${LUA_VERSION}")
 
-project(lualib VERSION 5.2.4)
+# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+  cmake_policy(SET CMP0135 NEW)
+endif()
 
-add_library(lualib STATIC
-    lapi.c
-    lauxlib.c
-    lbaselib.c
-    lbitlib.c
-    lcode.c
-    lcorolib.c
-    lctype.c
-    ldblib.c
-    ldebug.c
-    ldo.c
-    ldump.c
-    lfunc.c
-    lgc.c
-    linit.c
-    liolib.c
-    llex.c
-    lmathlib.c
-    lmem.c
-    loadlib.c
-    lobject.c
-    lopcodes.c
-    loslib.c
-    lparser.c
-    lstate.c
-    lstring.c
-    lstrlib.c
-    ltable.c
-    ltablib.c
-    ltm.c
-    lundump.c
-    lvm.c
-    lzio.c
-    lapi.h
-    lauxlib.h
-    lcode.h
-    lctype.h
-    ldebug.h
-    ldo.h
-    lfunc.h
-    lgc.h
-    llex.h
-    llimits.h
-    lmem.h
-    lobject.h
-    lopcodes.h
-    lparser.h
-    lstate.h
-    lstring.h
-    ltable.h
-    ltm.h
-    lua.h
-    luaconf.h
-    lualib.h
-    lundump.h
-    lvm.h
-    lzio.h
-)
+if (WIN32)
+  option(LUA_STATIC "link lua statically" ON)
+else()
+  option(LUA_STATIC "link lua statically" OFF)
+endif()
 
-target_include_directories(lualib
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-)
+if (LUA_STATIC)
+  MESSAGE(STATUS "Lua linking: static")
+else()
+  MESSAGE(STATUS "Lua linking: dynamic")
+endif()
 
+if (LUA_VERSION MATCHES "luajit")
+  add_subdirectory(luajit)
+else()
+  add_subdirectory(lua)
+endif()