aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authors_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-01-13 20:33:19 +0000
committers_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-01-13 20:33:19 +0000
commite404ff79067fcde24150f42c2dcb926ec5926fd1 (patch)
treea9a3e2c303f254a12dcd8193ea73643aacb352b4 /src
parent17a8202decb7e88c729a3046f5e0b57eb2d6e6da (diff)
downloadusdx-e404ff79067fcde24150f42c2dcb926ec5926fd1.tar.gz
usdx-e404ff79067fcde24150f42c2dcb926ec5926fd1.tar.xz
usdx-e404ff79067fcde24150f42c2dcb926ec5926fd1.zip
change lua lib filename for different versions
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2088 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/config.inc.in5
-rw-r--r--src/lib/Lua/ULua.pas6
2 files changed, 7 insertions, 4 deletions
diff --git a/src/config.inc.in b/src/config.inc.in
index 004f8413..b5e086f4 100644
--- a/src/config.inc.in
+++ b/src/config.inc.in
@@ -5,6 +5,10 @@
{* Libraries *}
+{$IF Defined(IncludeConstants)}
+ lua_lib_name = '@lua_LIB_NAME@';
+{$IFEND}
+
{$@DEFINE_HAVE_FFMPEG@ HaveFFmpeg}
{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)}
av__codec = 'libavcodec';
@@ -47,4 +51,3 @@
{$IFEND}
{$@DEFINE_HAVE_PORTMIXER@ HavePortmixer}
-
diff --git a/src/lib/Lua/ULua.pas b/src/lib/Lua/ULua.pas
index f0396bfe..1de48a3c 100644
--- a/src/lib/Lua/ULua.pas
+++ b/src/lib/Lua/ULua.pas
@@ -15,7 +15,8 @@ interface
{$IFDEF UNIX}
uses
- dl;
+ dl,
+ UConfig;
{$ENDIF}
{$DEFINE LUA51}
@@ -37,8 +38,7 @@ const
LuaDLL = 'liblua.5.1.dylib';
{$linklib liblua.5.1}
{$ELSE}
- LuaDLL51 = 'lua5.1.so';
- LuaDLL = 'lua.so';
+ LuaDLL = lua_lib_name;
{$ENDIF}
{$ENDIF}
{$IFDEF MACOS}