From c80d96a5edceba85d46fc038946950bb19dd56d0 Mon Sep 17 00:00:00 2001
From: Sergwest <ksendzov.sd@gmail.com>
Date: Wed, 20 Mar 2024 22:38:41 +0300
Subject: [PATCH] fix lua and luajit conflict

---
 CMakeLists.txt                        | 9 +++++----
 README.md                             | 4 ++--
 src/logic/scripting/lua/lua_commons.h | 6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fadedd5a..fa193b70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,8 @@ find_package(GLEW REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)
 
+set(LIBS "")
+
 if (WIN32)
     if(VOXELENGINE_BUILD_WINDOWS_VCPKG)
       set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
@@ -99,8 +101,9 @@ if (WIN32)
       add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
     endif()
 else()
-    # luajit has no CMakeLists.txt to use it as subdirectory, so install it manually
-    find_package(Lua REQUIRED)
+    find_package(PkgConfig)
+    pkg_check_modules(LUAJIT REQUIRED luajit)
+    set(LUA_LIBRARIES ${LUAJIT_LIBRARIES})
     find_package(PNG REQUIRED)
     set(PNGLIB PNG::PNG)
     set(VORBISLIB vorbis vorbisfile)
@@ -110,8 +113,6 @@ if (APPLE)
     find_package(glfw3 3.3 REQUIRED)
 endif ()
 
-set(LIBS "")
-
 if(UNIX)
     find_package(Threads REQUIRED)
     set(LIBS ${LIBS} Threads::Threads)
diff --git a/README.md b/README.md
index 47499cde..df7608ae 100644
--- a/README.md
+++ b/README.md
@@ -50,12 +50,12 @@ sudo dnf install glfw-devel glfw glew-devel glm-devel libpng-devel libvorbis-dev
 #### Arch-based distro:
 If you use X11
 ```sh
-sudo pacman -S glfw-x11 glew glm libpng libvorbis openal
+sudo pacman -S glfw-x11 glew glm libpng libvorbis openal lua
 ```
 
 If you use Wayland
 ```sh
-sudo pacman -S glfw-wayland glew glm libpng libvorbis openal
+sudo pacman -S glfw-wayland glew glm libpng libvorbis openal lua
 ```
 
 \+ install LuaJIT
diff --git a/src/logic/scripting/lua/lua_commons.h b/src/logic/scripting/lua/lua_commons.h
index 4732662d..d8d6b02c 100644
--- a/src/logic/scripting/lua/lua_commons.h
+++ b/src/logic/scripting/lua/lua_commons.h
@@ -1,7 +1,13 @@
 #ifndef LOGIC_SCRIPTING_LUA_H_
 #define LOGIC_SCRIPTING_LUA_H_
 
+#ifdef __linux__ 
+#include <lua/lua.hpp>
+#undef luaconf_h
+#include <luaconf.h>
+#else
 #include <lua.hpp>
+#endif
 #include <exception>
 
 namespace lua {