diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-14 13:00:43 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-14 13:00:43 +0000 |
| commit | f4ec6e43393e8d485b3dc301368abcdf80cfe64a (patch) | |
| tree | 44cefc1e883cc91c5464650f90a71093f66b5e25 | |
| parent | 7ff091f56cb965d06780e30fbf7cbaeab5fc0cb8 (diff) | |
| download | usdx-f4ec6e43393e8d485b3dc301368abcdf80cfe64a.tar.gz usdx-f4ec6e43393e8d485b3dc301368abcdf80cfe64a.tar.xz usdx-f4ec6e43393e8d485b3dc301368abcdf80cfe64a.zip | |
config.inc fixes. maybe fixes delphi path problem.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2921 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | src/config-win.inc | 36 | ||||
| -rw-r--r-- | src/config.inc.in | 25 |
2 files changed, 33 insertions, 28 deletions
diff --git a/src/config-win.inc b/src/config-win.inc index 843fdb0e..efa2413c 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -5,21 +5,27 @@ {* Libraries *} {$DEFINE HaveFFmpeg} -{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} - av__codec = 'avcodec-52'; - LIBAVCODEC_VERSION_MAJOR = 52; - LIBAVCODEC_VERSION_MINOR = 67; - LIBAVCODEC_VERSION_RELEASE = 2; - - av__format = 'avformat-52'; - LIBAVFORMAT_VERSION_MAJOR = 52; - LIBAVFORMAT_VERSION_MINOR = 62; - LIBAVFORMAT_VERSION_RELEASE = 0; - - av__util = 'avutil-50'; - LIBAVUTIL_VERSION_MAJOR = 50; - LIBAVUTIL_VERSION_MINOR = 15; - LIBAVUTIL_VERSION_RELEASE = 2; + +{$IF Defined(HaveFFmpeg)} + {$IFNDEF FFMPEG_DIR} + {$DEFINE FFMPEG_DIR := 'ffmpeg'} + {$ENDIF} + {$IF Defined(IncludeConstants)} + av__codec = 'avcodec-52'; + LIBAVCODEC_VERSION_MAJOR = 52; + LIBAVCODEC_VERSION_MINOR = 67; + LIBAVCODEC_VERSION_RELEASE = 2; + + av__format = 'avformat-52'; + LIBAVFORMAT_VERSION_MAJOR = 52; + LIBAVFORMAT_VERSION_MINOR = 62; + LIBAVFORMAT_VERSION_RELEASE = 0; + + av__util = 'avutil-50'; + LIBAVUTIL_VERSION_MAJOR = 50; + LIBAVUTIL_VERSION_MINOR = 15; + LIBAVUTIL_VERSION_RELEASE = 2; + {$IFEND} {$IFEND} {$DEFINE HaveSWScale} diff --git a/src/config.inc.in b/src/config.inc.in index 9fdac067..ba454fb7 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -20,21 +20,20 @@ {$IFEND} {$IFEND} {$IF Defined(IncludeConstants)} - av__codec = 'libavcodec'; - LIBAVCODEC_VERSION_MAJOR = @libavcodec_VERSION_MAJOR@; - LIBAVCODEC_VERSION_MINOR = @libavcodec_VERSION_MINOR@; - LIBAVCODEC_VERSION_RELEASE = @libavcodec_VERSION_RELEASE@; + av__codec = 'libavcodec'; + LIBAVCODEC_VERSION_MAJOR = @libavcodec_VERSION_MAJOR@; + LIBAVCODEC_VERSION_MINOR = @libavcodec_VERSION_MINOR@; + LIBAVCODEC_VERSION_RELEASE = @libavcodec_VERSION_RELEASE@; - av__format = 'libavformat'; - LIBAVFORMAT_VERSION_MAJOR = @libavformat_VERSION_MAJOR@; - LIBAVFORMAT_VERSION_MINOR = @libavformat_VERSION_MINOR@; - LIBAVFORMAT_VERSION_RELEASE = @libavformat_VERSION_RELEASE@; + av__format = 'libavformat'; + LIBAVFORMAT_VERSION_MAJOR = @libavformat_VERSION_MAJOR@; + LIBAVFORMAT_VERSION_MINOR = @libavformat_VERSION_MINOR@; + LIBAVFORMAT_VERSION_RELEASE = @libavformat_VERSION_RELEASE@; - av__util = 'libavutil'; - LIBAVUTIL_VERSION_MAJOR = @libavutil_VERSION_MAJOR@; - LIBAVUTIL_VERSION_MINOR = @libavutil_VERSION_MINOR@; - LIBAVUTIL_VERSION_RELEASE = @libavutil_VERSION_RELEASE@; - + av__util = 'libavutil'; + LIBAVUTIL_VERSION_MAJOR = @libavutil_VERSION_MAJOR@; + LIBAVUTIL_VERSION_MINOR = @libavutil_VERSION_MINOR@; + LIBAVUTIL_VERSION_RELEASE = @libavutil_VERSION_RELEASE@; {$IFEND} {$IFEND} |