From 643beb83b6e7c6285c84d45923140c8d2e9aaa0b Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Fri, 3 May 2013 23:47:45 +0000 Subject: extend the detection of ffmpeg and lua. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2979 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config.inc.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/config.inc.in') diff --git a/src/config.inc.in b/src/config.inc.in index 073b59b3..954d3416 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -6,8 +6,8 @@ {* Libraries *} {$IF Defined(IncludeConstants)} - lua_lib_name = '@lua_LIB_NAME@'; - LUA_VERSION_INT = '@lua_VERSION_INT@'; + LUA_LIB_NAME = '@lua_LIB_NAME@'; + LUA_VERSION_INT = @lua_VERSION_INT@; LUA_VERSION_RELEASE = '@lua_VERSION_RELEASE@'; LUA_VERSION_MINOR = '@lua_VERSION_MINOR@'; LUA_VERSION_MAJOR = '@lua_VERSION_MAJOR@'; @@ -18,7 +18,7 @@ {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF @FFMPEG_VERSION_MINOR@ > 0} + {$IF (@FFMPEG_VERSION_MINOR@ > 0) or (@FFMPEG_VERSION_MAJOR@ > 0)} {$DEFINE FFMPEG_DIR := 'ffmpeg-@FFMPEG_VERSION_MAJOR@.@FFMPEG_VERSION_MINOR@'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} -- cgit v1.2.3