diff --git a/CMakeLists.txt b/CMakeLists.txt index fadedd5a..731993ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,8 +99,10 @@ 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}) + set(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIR}) find_package(PNG REQUIRED) set(PNGLIB PNG::PNG) set(VORBISLIB vorbis vorbisfile) diff --git a/README.md b/README.md index 47499cde..388725f4 100644 --- a/README.md +++ b/README.md @@ -42,29 +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 +sudo dnf install glfw-devel glfw glew-devel glm-devel libpng-devel libvorbis-devel openal-devel luajit ``` -\+ install LuaJIT - #### 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 luajit ``` If you use Wayland ```sh -sudo pacman -S glfw-wayland glew glm libpng libvorbis openal -``` - -\+ install LuaJIT - -#### LuaJIT installation: -```sh -git clone https://luajit.org/git/luajit.git -cd luajit -make && sudo make install INSTALL_INC=/usr/include/lua +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 4732662d..150ef567 100644 --- a/src/logic/scripting/lua/lua_commons.h +++ b/src/logic/scripting/lua/lua_commons.h @@ -1,7 +1,12 @@ #ifndef LOGIC_SCRIPTING_LUA_H_ #define LOGIC_SCRIPTING_LUA_H_ +#ifdef __linux__ +#include +#include +#else #include +#endif #include namespace lua { 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"