From cd4d4ed938b3ca22e4888dd285941545649c46e6 Mon Sep 17 00:00:00 2001 From: poetic android Date: Fri, 6 Dec 2019 00:32:23 +0100 Subject: [PATCH] perhaps symlinking on Fedora isn't needed? --- install_dependencies.sh | 6 ++++-- source/machine.d | 2 +- source/riverd-lua/source/riverd/lua/dynload.d | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/install_dependencies.sh b/install_dependencies.sh index 1c5021a..041348a 100644 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -14,7 +14,9 @@ else ( sudo apt-get install libsdl2-2.0-0 libfreeimage3 liblua5.3-dev curl || - (sudo dnf install SDL2 freeimage lua curl && - sudo ln -s /usr/lib64/liblua-5.3.so /usr/lib64/liblua5.3.so) + ( + sudo dnf install SDL2 freeimage lua curl # && + # sudo ln -s /usr/lib64/liblua-5.3.so /usr/lib64/liblua5.3.so + ) ) && rm "$0" fi diff --git a/source/machine.d b/source/machine.d index c2399aa..a2c1751 100644 --- a/source/machine.d +++ b/source/machine.d @@ -26,7 +26,7 @@ import pixmap; import image_loader; import network; -const VERSION = "0.9.11"; /// version of the software +const VERSION = "0.9.12"; /// version of the software /** Class representing "the machine"! diff --git a/source/riverd-lua/source/riverd/lua/dynload.d b/source/riverd-lua/source/riverd/lua/dynload.d index 1c4906a..85cc51a 100644 --- a/source/riverd-lua/source/riverd/lua/dynload.d +++ b/source/riverd-lua/source/riverd/lua/dynload.d @@ -63,7 +63,7 @@ version(D_BetterC) void* dylib_load_lua() { version(Windows) void* handle = dylib_load("lua53.dll"); else version(OSX) void* handle = dylib_load("liblua.5.3.dylib"); - else version(Posix) void* handle = dylib_load("liblua.so.5.3,liblua5.3.so"); + else version(Posix) void* handle = dylib_load("liblua.so.5.3,liblua5.3.so,liblua-5.3.so"); if(handle is null) return null; @@ -222,7 +222,7 @@ else { version(Windows) private enum string[] _lua_libs = ["lua53.dll"]; else version(OSX) private enum string[] _lua_libs = ["liblua.5.3.dylib"]; - else version(Posix) private enum string[] _lua_libs = ["liblua.so.5.3", "liblua5.3.so"]; + else version(Posix) private enum string[] _lua_libs = ["liblua.so.5.3", "liblua5.3.so", "liblua-5.3.so"]; mixin(DylibLoaderBuilder!("Lua", _lua_libs, riverd.lua.dynfun)); }