From c2642efc13ede8debbf6993e8edc588a1ebbf984 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Mon, 28 Dec 2015 15:34:04 +0000 Subject: add configure for swresample git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3154 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/config-darwin.inc | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'src/config-darwin.inc') diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 8bde009d..37ce2334 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -7,19 +7,19 @@ {$IF Defined(IncludeConstants)} LUA_LIB_NAME = 'lua'; - LUA_VERSION_INT = 5001005; - LUA_VERSION_RELEASE = '5'; - LUA_VERSION_MINOR = '1'; + LUA_VERSION_INT = 5002004; + LUA_VERSION_RELEASE = '4'; + LUA_VERSION_MINOR = '2'; LUA_VERSION_MAJOR = '5'; - LUA_VERSION = '5.1.5'; + LUA_VERSION = '5.2.4'; {$IFEND} {$DEFINE HaveFFmpeg} {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF (4 > 0) or (2 > 0)} - {$DEFINE FFMPEG_DIR := 'ffmpeg-2.4'} + {$IF (8 > 0) or (2 > 0)} + {$DEFINE FFMPEG_DIR := 'ffmpeg-2.8'} {$DEFINE FF_API_OLD_DECODE_AUDIO} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} @@ -27,21 +27,21 @@ {$IFEND} {$ENDIF} {$IF Defined(IncludeConstants)} - FFMPEG_VERSION_INT = 2004000; + FFMPEG_VERSION_INT = 2008000; av__codec = 'libavcodec'; LIBAVCODEC_VERSION_MAJOR = 56; - LIBAVCODEC_VERSION_MINOR = 1; + LIBAVCODEC_VERSION_MINOR = 60; LIBAVCODEC_VERSION_RELEASE = 100; av__format = 'libavformat'; LIBAVFORMAT_VERSION_MAJOR = 56; - LIBAVFORMAT_VERSION_MINOR = 4; + LIBAVFORMAT_VERSION_MINOR = 40; LIBAVFORMAT_VERSION_RELEASE = 101; av__util = 'libavutil'; LIBAVUTIL_VERSION_MAJOR = 54; - LIBAVUTIL_VERSION_MINOR = 7; + LIBAVUTIL_VERSION_MINOR = 31; LIBAVUTIL_VERSION_RELEASE = 100; {$IFEND} {$IFEND} @@ -50,8 +50,16 @@ {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'libswscale'; LIBSWSCALE_VERSION_MAJOR = 3; - LIBSWSCALE_VERSION_MINOR = 0; - LIBSWSCALE_VERSION_RELEASE = 100; + LIBSWSCALE_VERSION_MINOR = 1; + LIBSWSCALE_VERSION_RELEASE = 101; +{$IFEND} + +{$DEFINE HaveSWResample} +{$IF Defined(HaveSWScale) and Defined(IncludeConstants)} + sw__resample = 'libswresample'; + LIBSWRESAMPLE_VERSION_MAJOR = 1; + LIBSWRESAMPLE_VERSION_MINOR = 2; + LIBSWRESAMPLE_VERSION_RELEASE = 101; {$IFEND} {$UNDEF HaveProjectM} @@ -71,6 +79,7 @@ {$DEFINE HaveLibPcre} {$IF Defined(HaveLibPcre) and Defined(IncludeConstants)} + LIBPCRE_LIBNAME = ''; LIBPCRE_LIBDIR = '/sw/lib/libpcre1'; {$IFEND} -- cgit v1.2.3