diff options
| -rw-r--r-- | Game/Code/UltraStar.dpr | 12 | ||||
| -rw-r--r-- | Game/Code/config-win.inc | 4 | ||||
| -rw-r--r-- | Game/Code/config.inc.in | 4 | ||||
| -rw-r--r-- | Game/Code/switches.inc | 20 |
4 files changed, 16 insertions, 24 deletions
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 4b3f4e82..c39f596c 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -65,7 +65,7 @@ uses portmixer in 'lib\portmixer\delphi\portmixer.pas', {$ENDIF} - {$IFDEF UseFFMpeg} + {$IFDEF UseFFmpeg} avcodec in 'lib\ffmpeg\avcodec.pas', avformat in 'lib\ffmpeg\avformat.pas', avutil in 'lib\ffmpeg\avutil.pas', @@ -73,7 +73,7 @@ uses opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', mathematics in 'lib\ffmpeg\mathematics.pas', - UMediaCore_FFMpeg in 'Classes\UMediaCore_FFMpeg.pas', + UMediaCore_FFmpeg in 'Classes\UMediaCore_FFmpeg.pas', {$IFDEF UseSWScale} swscale in 'lib\ffmpeg\swscale.pas', {$ENDIF} @@ -205,7 +205,7 @@ uses // TODO : these all should be moved to a media folder -{$IFDEF UseFFMpegVideo} +{$IFDEF UseFFmpegVideo} UVideo in 'Classes\UVideo.pas', {$ENDIF} {$IFDEF UseProjectM} @@ -216,7 +216,7 @@ uses UAudioInput_Bass in 'Classes\UAudioInput_Bass.pas', {$ENDIF} {$IFDEF UseBASSDecoder} - // prefer Bass to FFMpeg if possible + // prefer Bass to FFmpeg if possible UAudioDecoder_Bass in 'Classes\UAudioDecoder_Bass.pas', {$ENDIF} {$IFDEF UseBASSPlayback} @@ -231,8 +231,8 @@ uses {$IFDEF UsePortaudioPlayback} UAudioPlayback_Portaudio in 'Classes\UAudioPlayback_Portaudio.pas', {$ENDIF} -{$IFDEF UseFFMpegDecoder} - UAudioDecoder_FFMpeg in 'Classes\UAudioDecoder_FFMpeg.pas', +{$IFDEF UseFFmpegDecoder} + UAudioDecoder_FFmpeg in 'Classes\UAudioDecoder_FFmpeg.pas', {$ENDIF} // fallback dummy, must be last UMedia_dummy in 'Classes\UMedia_dummy.pas', diff --git a/Game/Code/config-win.inc b/Game/Code/config-win.inc index 3a2e7d0e..e3ca8840 100644 --- a/Game/Code/config-win.inc +++ b/Game/Code/config-win.inc @@ -4,8 +4,8 @@ {* Libraries *} -{$DEFINE HaveFFMpeg} -{$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)} +{$DEFINE HaveFFmpeg} +{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} av__codec = 'avcodec-51'; LIBAVCODEC_VERSION_MAJOR = 51; LIBAVCODEC_VERSION_MINOR = 16; diff --git a/Game/Code/config.inc.in b/Game/Code/config.inc.in index 90471b8d..6bdf26b5 100644 --- a/Game/Code/config.inc.in +++ b/Game/Code/config.inc.in @@ -13,8 +13,8 @@ {* Libraries *} -{$@DEFINE_HAVE_FFMPEG@ HaveFFMpeg} -{$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)} +{$@DEFINE_HAVE_FFMPEG@ HaveFFmpeg} +{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} av__codec = 'libavcodec'; LIBAVCODEC_VERSION_MAJOR = @libavcodec_VERSION_MAJOR@; LIBAVCODEC_VERSION_MINOR = @libavcodec_VERSION_MINOR@; diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc index bb9a50fe..eb67e72c 100644 --- a/Game/Code/switches.inc +++ b/Game/Code/switches.inc @@ -1,11 +1,3 @@ -// Comment by eddie: -// The mac port currently also uses the WIN32 define. -// Once I get the beast compiled, linked and running -// I will change this. -// There are some parts where the WIN32 define could not -// be used. I changed the WIN32 to MSWINDOWS. -// So, for Windows-only code use the MSWINDOWS define. - // compiler/IDE dependent config {$IFDEF FPC} {$H+} // use AnsiString instead of ShortString as String-type (default in Delphi) @@ -86,10 +78,10 @@ {$IFEND} // ffmpeg config -{$IFDEF HaveFFMpeg} - {$DEFINE UseFFMpegDecoder} - {$DEFINE UseFFMpegResample} - {$DEFINE UseFFMpegVideo} +{$IFDEF HaveFFmpeg} + {$DEFINE UseFFmpegDecoder} + {$DEFINE UseFFmpegResample} + {$DEFINE UseFFmpegVideo} {$IFDEF HaveSWScale} {$DEFINE UseSWScale} {$ENDIF} @@ -106,8 +98,8 @@ // specify some useful defines -{$IF Defined(UseFFMpegVideo) or Defined(UseFFMpegDecoder)} - {$DEFINE UseFFMpeg} +{$IF Defined(UseFFmpegVideo) or Defined(UseFFmpegDecoder)} + {$DEFINE UseFFmpeg} {$IFEND} {$IF Defined(UseBASSInput) or Defined(UseBASSPlayback) or Defined(UseBASSDecoder)} |