diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-05-03 23:47:45 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-05-03 23:47:45 +0000 |
| commit | 643beb83b6e7c6285c84d45923140c8d2e9aaa0b (patch) | |
| tree | 8a5634a195a0bf2bc9550f19be813f67113d1f92 /src | |
| parent | aa8a156700ed922b3b8188b7abd9deb2f49fa22b (diff) | |
| download | usdx-643beb83b6e7c6285c84d45923140c8d2e9aaa0b.tar.gz usdx-643beb83b6e7c6285c84d45923140c8d2e9aaa0b.tar.xz usdx-643beb83b6e7c6285c84d45923140c8d2e9aaa0b.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/config-darwin.inc | 6 | ||||
| -rw-r--r-- | src/config.inc.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 345f0ed9..181eda57 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -6,8 +6,8 @@ {* Libraries *} {$IF Defined(IncludeConstants)} - lua_lib_name = 'lua'; - LUA_VERSION_INT = '5001004'; + LUA_LIB_NAME = '@lua_LIB_NAME@'; + LUA_VERSION_INT = 5001004; LUA_VERSION_RELEASE = '4'; LUA_VERSION_MINOR = '1'; LUA_VERSION_MAJOR = '5'; @@ -18,7 +18,7 @@ {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF 8 > 0} + {$IF (8 > 0) or (0 > 0)} {$DEFINE FFMPEG_DIR := 'ffmpeg-0.8'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} 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'} |