From 0d997f8433e982584a0ab67a6d630d12f4314759 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 11 Oct 2007 10:50:01 +0000 Subject: fixes so codebase builds in delphi now, after major FFMpeg changse for linux. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@503 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/avcodec.pas | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'Game/Code/lib/ffmpeg/avcodec.pas') diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas index c82bc329..9c232fff 100644 --- a/Game/Code/lib/ffmpeg/avcodec.pas +++ b/Game/Code/lib/ffmpeg/avcodec.pas @@ -22,11 +22,13 @@ in the source codes *) unit avcodec; -{$LINKLIB libavutil} -{$LINKLIB libavcodec} -{$MODE DELPHI } (* CAT *) -{$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *) -{$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *) +{$IFDEF FPC} + {$LINKLIB libavutil} + {$LINKLIB libavcodec} + {$MODE DELPHI } (* CAT *) + {$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *) + {$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *) +{$ENDIF} interface @@ -34,8 +36,13 @@ uses avutil, rational, opt; // CAT const -(* version numbers are changed by The Creative CAT *) - av__format = 'libavformat.51'; +{$IFDEF win32} + av__format = 'avformat-50.dll'; +{$ELSE} + av__format = 'libavformat.so'; // .0d +// av__format = 'libavformat.51'; +{$ENDIF} + LIBAVUTIL_VERSION_INT = ((51 shl 16) + (12 shl 8) + 1); LIBAVUTIL_VERSION = '51.12.1'; -- cgit v1.2.3