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

we dont need lua anymore (linux)!

Browse Source
This commit is contained in:
Sergwest 2024-03-21 15:55:44 +03:00
parent 77257c9e6a
commit b76d5931c3
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -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:

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

@ -2,9 +2,8 @@
#define LOGIC_SCRIPTING_LUA_H_
#ifdef __linux__
#include <luajit-2.1/luaconf.h>
#include <luajit-2.1/lua.hpp>
#undef luaconf_h
#include <luaconf.h>
#else
#include <lua.hpp>
#endif

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

@ -1,7 +1,12 @@
#ifndef 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>
#endif
#include <glm/glm.hpp>
#include "LuaState.h"