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/ultrastardx.dpr | |
| 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/ultrastardx.dpr')
| -rw-r--r-- | src/ultrastardx.dpr | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 682c3cd7..0c899632 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -85,17 +85,29 @@ uses {$IFDEF UsePortmixer} portmixer in 'lib\portmixer\portmixer.pas', {$ENDIF} + {$IFDEF UseFFmpeg} - avcodec in AVCODEC_PATH, - avformat in AVFORMAT_PATH, - avutil in AVUTIL_PATH, - rational in RATIONAL_PATH, - avio in AVIO_PATH, + {$IFDEF FPC} // This solution is not very elegant, but working + 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 SWSCALE_PATH, + swscale in 'lib\' + FFMPEG_DIR + '\swscale.pas', {$ENDIF} - UMediaCore_FFmpeg in 'media\UMediaCore_FFmpeg.pas', - {$ENDIF} + {$ELSE} // speak: This is for Delphi. Change version as needed! + avcodec in 'lib\ffmpeg-0.10\avcodec.pas', + avformat in 'lib\ffmpeg-0.10\avformat.pas', + avutil in 'lib\ffmpeg-0.10\avutil.pas', + rational in 'lib\ffmpeg-0.10\rational.pas', + avio in 'lib\ffmpeg-0.10\avio.pas', + {$IFDEF UseSWScale} + swscale in 'lib\ffmpeg-0.10\swscale.pas', + {$ENDIF} + {$ENDIF} + UMediaCore_FFmpeg in 'media\UMediaCore_FFmpeg.pas', + {$ENDIF} // UseFFmpeg {$IFDEF UseSRCResample} samplerate in 'lib\samplerate\samplerate.pas', |