PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #197 from AFK1/fix

Browse Source 
Luajit linux fix
This commit is contained in:
MihailRis 2024-03-22 09:11:59 +03:00 committed by GitHub
commit a245878b8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -99,8 +99,10 @@ if (WIN32)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
endif() endif()
else() else()
# luajit has no CMakeLists.txt to use it as subdirectory, so install it manually find_package(PkgConfig)
find_package(Lua REQUIRED) pkg_check_modules(LUAJIT REQUIRED luajit)
set(LUA_LIBRARIES ${LUAJIT_LIBRARIES})
set(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIR})
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
set(PNGLIB PNG::PNG) set(PNGLIB PNG::PNG)
set(VORBISLIB vorbis vorbisfile) set(VORBISLIB vorbis vorbisfile)

17
README.md
View File

@ -42,29 +42,18 @@ sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
#### RHEL-based distro: #### RHEL-based distro:
```sh ```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: #### Arch-based distro:
If you use X11 If you use X11
```sh ```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 If you use Wayland
```sh ```sh
sudo pacman -S glfw-wayland glew glm libpng libvorbis openal sudo pacman -S glfw-wayland glew glm libpng libvorbis openal luajit
```
\+ install LuaJIT
#### LuaJIT installation:
```sh
git clone https://luajit.org/git/luajit.git
cd luajit
make && sudo make install INSTALL_INC=/usr/include/lua
``` ```
#### macOS: #### macOS:

5
src/logic/scripting/lua/lua_commons.h
View File

@ -1,7 +1,12 @@
#ifndef LOGIC_SCRIPTING_LUA_H_ #ifndef LOGIC_SCRIPTING_LUA_H_
#define LOGIC_SCRIPTING_LUA_H_ #define LOGIC_SCRIPTING_LUA_H_
#ifdef __linux__
#include <luajit-2.1/luaconf.h>
#include <luajit-2.1/lua.hpp>
#else
#include <lua.hpp> #include <lua.hpp>
#endif
#include <exception> #include <exception>
namespace lua { namespace lua {

5
src/logic/scripting/lua/lua_util.h
View File

@ -1,7 +1,12 @@
#ifndef LOGIC_SCRIPTING_LUA_UTIL_H_ #ifndef LOGIC_SCRIPTING_LUA_UTIL_H_
#define LOGIC_SCRIPTING_LUA_UTIL_H_ #define LOGIC_SCRIPTING_LUA_UTIL_H_
#ifdef __linux__
#include <luajit-2.1/luaconf.h>
#include <luajit-2.1/lua.hpp>
#else
#include <lua.hpp> #include <lua.hpp>
#endif
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "LuaState.h" #include "LuaState.h"