From e404ff79067fcde24150f42c2dcb926ec5926fd1 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Wed, 13 Jan 2010 20:33:19 +0000 Subject: 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 --- src/config.inc.in | 5 ++++- src/lib/Lua/ULua.pas | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src') 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} -- cgit v1.2.3