diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-10-20 08:49:17 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-10-20 08:49:17 +0000 |
| commit | c7debe9f511f035ac1221f8dce230a4f34dadb3b (patch) | |
| tree | 4a0781d716f9205954dfbe214ab9fbd088c23a04 /src | |
| parent | 65a64deeb0d295749f97f04ebd4c85122082fe71 (diff) | |
| download | usdx-c7debe9f511f035ac1221f8dce230a4f34dadb3b.tar.gz usdx-c7debe9f511f035ac1221f8dce230a4f34dadb3b.tar.xz usdx-c7debe9f511f035ac1221f8dce230a4f34dadb3b.zip | |
try to fix compilation with old ffmpeg
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2928 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
| -rw-r--r-- | src/config-darwin.inc | 1 | ||||
| -rw-r--r-- | src/config.inc.in | 1 | ||||
| -rw-r--r-- | src/ultrastardx.dpr | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 67a4c242..3d7aa374 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -17,6 +17,7 @@ {$DEFINE FFMPEG_DIR := 'ffmpeg-0.8'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} + {$DEFINE useOLD_FFMPEG} {$IFEND} {$ENDIF} {$IF Defined(IncludeConstants)} diff --git a/src/config.inc.in b/src/config.inc.in index 168a1ced..a901a5fa 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -17,6 +17,7 @@ {$DEFINE FFMPEG_DIR := 'ffmpeg-@FFMPEG_VERSION_MAJOR@.@FFMPEG_VERSION_MINOR@'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} + {$DEFINE useOLD_FFMPEG} {$IFEND} {$ENDIF} {$IF Defined(IncludeConstants)} diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 9a77eea3..6636724f 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -91,10 +91,11 @@ uses avcodec in 'lib\' + FFMPEG_DIR + '\avcodec.pas', avformat in 'lib\' + FFMPEG_DIR + '\avformat.pas', avutil in 'lib\' + FFMPEG_DIR + '\avutil.pas', - mathematics in 'lib\' + FFMPEG_DIR + '\mathematics.pas', - opt in 'lib\' + FFMPEG_DIR + '\opt.pas', rational in 'lib\' + FFMPEG_DIR + '\rational.pas', avio in 'lib\' + FFMPEG_DIR + '\avio.pas', + {$IFDEF useOLD_FFMPEG} + mathematics in 'lib\' + FFMPEG_DIR + '\mathematics.pas', + {$ENDIF} {$IFDEF UseSWScale} swscale in 'lib\' + FFMPEG_DIR + '\swscale.pas', {$ENDIF} |