aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-15 15:23:12 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-15 15:23:12 +0000
commitb8556338b9612677ee4b4d91a9c2d2bf59f5ecce (patch)
treea3480cf219967859f97ae4170c86fc7a92b0ed64
parentf4ec6e43393e8d485b3dc301368abcdf80cfe64a (diff)
downloadusdx-b8556338b9612677ee4b4d91a9c2d2bf59f5ecce.tar.gz
usdx-b8556338b9612677ee4b4d91a9c2d2bf59f5ecce.tar.xz
usdx-b8556338b9612677ee4b4d91a9c2d2bf59f5ecce.zip
fix ffmpeg paths in configure for Delphi.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2922 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/config-win.inc20
-rw-r--r--src/config.inc.in20
-rw-r--r--src/ultrastardx.dpr18
3 files changed, 47 insertions, 11 deletions
diff --git a/src/config-win.inc b/src/config-win.inc
index efa2413c..0359038d 100644
--- a/src/config-win.inc
+++ b/src/config-win.inc
@@ -8,7 +8,25 @@
{$IF Defined(HaveFFmpeg)}
{$IFNDEF FFMPEG_DIR}
- {$DEFINE FFMPEG_DIR := 'ffmpeg'}
+ {$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';
diff --git a/src/config.inc.in b/src/config.inc.in
index ba454fb7..349d05c2 100644
--- a/src/config.inc.in
+++ b/src/config.inc.in
@@ -18,7 +18,25 @@
{$ELSE}
{$DEFINE FFMPEG_DIR := 'ffmpeg'}
{$IFEND}
- {$IFEND}
+ {$ENDIF}
+ {$IFNDEF AVCODEC_PATH}
+ {$DEFINE AVCODEC_PATH := 'lib\' + FFMPEG_DIR + '\avcodec.pas'}
+ {$ENDIF}
+ {$IFNDEF AVFORMAT_PATH}
+ {$DEFINE AVFORMAT_PATH := 'lib\' + FFMPEG_DIR + '\avformat.pas'}
+ {$ENDIF}
+ {$IFNDEF AVUTIL_PATH}
+ {$DEFINE AVUTIL_PATH := 'lib\' + FFMPEG_DIR + '\avutil.pas'}
+ {$ENDIF}
+ {$IFNDEF RATIONAL_PATH}
+ {$DEFINE RATIONAL_PATH := 'lib\' + FFMPEG_DIR + '\rational.pas'}
+ {$ENDIF}
+ {$IFNDEF AVIO_PATH}
+ {$DEFINE AVIO_PATH := 'lib\' + FFMPEG_DIR + '\avio.pas'}
+ {$ENDIF}
+ {$IFNDEF SWSCALE_PATH}
+ {$DEFINE SWSCALE_PATH := 'lib\' + FFMPEG_DIR + '\swscale.pas'}
+ {$ENDIF}
{$IF Defined(IncludeConstants)}
av__codec = 'libavcodec';
LIBAVCODEC_VERSION_MAJOR = @libavcodec_VERSION_MAJOR@;
diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr
index 21e89e2d..682c3cd7 100644
--- a/src/ultrastardx.dpr
+++ b/src/ultrastardx.dpr
@@ -86,15 +86,15 @@ uses
portmixer in 'lib\portmixer\portmixer.pas',
{$ENDIF}
{$IFDEF UseFFmpeg}
- avcodec in 'lib\' + FFMPEG_DIR + '\avcodec.pas',
- avformat in 'lib\' + FFMPEG_DIR + '\avformat.pas',
- avutil in 'lib\' + FFMPEG_DIR + '\avutil.pas',
- rational in 'lib\' + FFMPEG_DIR + '\rational.pas',
- avio in 'lib\' + FFMPEG_DIR + '\avio.pas',
- {$IFDEF UseSWScale}
- swscale in 'lib\' + FFMPEG_DIR + '\swscale.pas',
- {$ENDIF}
- UMediaCore_FFmpeg in 'media\UMediaCore_FFmpeg.pas',
+ avcodec in AVCODEC_PATH,
+ avformat in AVFORMAT_PATH,
+ avutil in AVUTIL_PATH,
+ rational in RATIONAL_PATH,
+ avio in AVIO_PATH,
+ {$IFDEF UseSWScale}
+ swscale in SWSCALE_PATH,
+ {$ENDIF}
+ UMediaCore_FFmpeg in 'media\UMediaCore_FFmpeg.pas',
{$ENDIF}
{$IFDEF UseSRCResample}