From b76d5931c3bd03201e0e81da89145fe64140f73c Mon Sep 17 00:00:00 2001 From: Sergwest Date: Thu, 21 Mar 2024 15:55:44 +0300 Subject: [PATCH] we dont need lua anymore (linux)! --- README.md | 8 ++++---- src/logic/scripting/lua/lua_commons.h | 3 +-- src/logic/scripting/lua/lua_util.h | 5 +++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fcbfb144..388725f4 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ cmake --build . #### Debian-based distro: ```sh -sudo apt install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev lua5.4 +sudo apt install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev ``` CMake missing LUA_INCLUDE_DIR and LUA_LIBRARIES fix: @@ -42,18 +42,18 @@ sudo ln -s /usr/include/luajit-2.1 /usr/include/lua #### RHEL-based distro: ```sh -sudo dnf install glfw-devel glfw glew-devel glm-devel libpng-devel libvorbis-devel openal-devel lua luajit +sudo dnf install glfw-devel glfw glew-devel glm-devel libpng-devel libvorbis-devel openal-devel luajit ``` #### Arch-based distro: If you use X11 ```sh -sudo pacman -S glfw-x11 glew glm libpng libvorbis openal lua luajit +sudo pacman -S glfw-x11 glew glm libpng libvorbis openal luajit ``` If you use Wayland ```sh -sudo pacman -S glfw-wayland glew glm libpng libvorbis openal lua luajit +sudo pacman -S glfw-wayland glew glm libpng libvorbis openal luajit ``` #### macOS: diff --git a/src/logic/scripting/lua/lua_commons.h b/src/logic/scripting/lua/lua_commons.h index 46b4cff1..150ef567 100644 --- a/src/logic/scripting/lua/lua_commons.h +++ b/src/logic/scripting/lua/lua_commons.h @@ -2,9 +2,8 @@ #define LOGIC_SCRIPTING_LUA_H_ #ifdef __linux__ +#include #include -#undef luaconf_h -#include #else #include #endif diff --git a/src/logic/scripting/lua/lua_util.h b/src/logic/scripting/lua/lua_util.h index a65926e9..d77bcec8 100644 --- a/src/logic/scripting/lua/lua_util.h +++ b/src/logic/scripting/lua/lua_util.h @@ -1,7 +1,12 @@ #ifndef LOGIC_SCRIPTING_LUA_UTIL_H_ #define LOGIC_SCRIPTING_LUA_UTIL_H_ +#ifdef __linux__ +#include +#include +#else #include +#endif #include #include "LuaState.h"