diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-29 13:15:28 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-29 13:15:28 +0000 |
| commit | 17c04c9149b1cb263e1e8d6211e393ee0c0b1b7d (patch) | |
| tree | 7af8b975cf9ab60be68f3526682881f1d28b7835 /src/config-win.inc | |
| parent | b8556338b9612677ee4b4d91a9c2d2bf59f5ecce (diff) | |
| download | usdx-17c04c9149b1cb263e1e8d6211e393ee0c0b1b7d.tar.gz usdx-17c04c9149b1cb263e1e8d6211e393ee0c0b1b7d.tar.xz usdx-17c04c9149b1cb263e1e8d6211e393ee0c0b1b7d.zip | |
another try to fix Delphi compilation. Ugly andless elegant, but hopefully closer to working.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2923 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/config-win.inc')
| -rw-r--r-- | src/config-win.inc | 53 |
1 files changed, 15 insertions, 38 deletions
diff --git a/src/config-win.inc b/src/config-win.inc index 0359038d..46e1f336 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -6,44 +6,21 @@ {$DEFINE HaveFFmpeg} -{$IF Defined(HaveFFmpeg)} - {$IFNDEF FFMPEG_DIR} - {$DEFINE FFMPEG_DIR := 'ffmpeg-0.10'} - {$ENDIF} - {$IFNDEF AVCODEC_PATH} - {$DEFINE AVCODEC_PATH := 'lib\ffmpeg-0.10\avcodec.pas'} - {$ENDIF} - {$IFNDEF AVFORMAT_PATH} - {$DEFINE AVFORMAT_PATH := 'lib\ffmpeg-0.10\avformat.pas'} - {$ENDIF} - {$IFNDEF AVUTIL_PATH} - {$DEFINE AVUTIL_PATH := 'lib\ffmpeg-0.10\avutil.pas'} - {$ENDIF} - {$IFNDEF RATIONAL_PATH} - {$DEFINE RATIONAL_PATH := 'lib\ffmpeg-0.10\rational.pas'} - {$ENDIF} - {$IFNDEF AVIO_PATH} - {$DEFINE AVIO_PATH := 'lib\ffmpeg-0.10\avio.pas'} - {$ENDIF} - {$IFNDEF SWSCALE_PATH} - {$DEFINE SWSCALE_PATH := 'lib\ffmpeg-0.10\swscale.pas'} - {$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} +{$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; {$IFEND} {$DEFINE HaveSWScale} |