1 files changed, 115 insertions, 77 deletions
diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc
index 29828712..a50c759b 100644
--- a/Game/Code/switches.inc
+++ b/Game/Code/switches.inc
@@ -1,77 +1,115 @@
-{$DEFINE DEBUG} // to-do : Remove b4 release
-
-// 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.
-
-
-{$IFDEF FPC}
-  {$IFDEF DARWIN}
-    {$H+}
-    {$R-}
-    {$DEFINE WIN32}		   
-    {$DEFINE TRANSLATE}
-		{$DEFINE UTF8_FILENAMES}
-  {$ELSE}
-    {$DEFINE LAZARUS}
-  {$ENDIF}
-
-  {$DEFINE DLL_CDECL}
-  {$UNDEF UseSerialPort}
-  {$UNDEF UseMIDIPort}
-{$ELSE}
-  {$DEFINE Delphi}
-  {$DEFINE DLL_STDCALL}
-  {$UNDEF UseSerialPort}
-  {$DEFINE UseMIDIPort}
-{$ENDIF}
-
-
-{$IFDEF win32}
-  {$I config-win.inc}
-
-  {$DEFINE UseBASSPlayback}
-  {$DEFINE UseBASSInput}
-
-  //{$DEFINE UseFFMpegDecoder}
-  //{$DEFINE UsePortaudioPlayback}
-  //{$DEFINE UsePortaudioInput}
-  //{$DEFINE UsePortmixer}
-
-  {$IF Defined(HaveProjectM_0_9)}
-    {$DEFINE UseProjectM_0_9}
-  {$ELSEIF Defined(HaveProjectM_1_0_PLUS)}
-    {$DEFINE UseProjectM_1_0}
-  {$IFEND}
-
-  {$IFDEF DEBUG}
-    {$IFNDEF DARWIN}
-      {$APPTYPE CONSOLE}
-	{$ENDIF}
-  {$ENDIF}
-{$ELSE}
-  {$DEFINE UseFFMpegAudio}
-  {$DEFINE UsePortaudio}
-  {$DEFINE UseProjectM_0_9}
-{$ENDIF}
-
-{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback)}
-  {$DEFINE UseBASS}
-{$IFEND}
-
-{$IF Defined(UsePortaudioInput) or Defined(UsePortaudioPlayback)}
-  {$DEFINE UsePortaudio}
-{$IFEND}
-
-{$IF Defined(UseProjectM_0_9) or Defined(UseProjectM_1_0)}
-  {$DEFINE UseProjectM}
-{$IFEND}
-
-// I had to add these (jay)... but maybe henny has some way that the config script is meant to do this ?
-// Ill need to check with him.
-//{$DEFINE FPC_V220}
-//{$DEFINE LAZARUS_V0924}
+// 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.
+
+{$IFDEF FPC}
+  {$IFDEF DARWIN}
+    {$H+}
+    {$R-}
+    {$DEFINE WIN32}
+    {$DEFINE TRANSLATE}
+		{$DEFINE UTF8_FILENAMES}
+  {$ELSE}
+    {$DEFINE LAZARUS}
+    {$IFNDEF LCL}
+      // LCL should be defined already
+      {$MESSAGE Warn 'LCL undefined, compile with "fpc -dLCL ..."!'}
+      {$DEFINE LCL}
+    {$ENDIF}
+  {$ENDIF}
+
+  {$DEFINE DLL_CDECL}
+  {$UNDEF UseSerialPort}
+  {$UNDEF UseMIDIPort}
+{$ELSE}
+  {$DEFINE Delphi}
+  {$DEFINE DLL_STDCALL}
+  {$UNDEF UseSerialPort}
+  {$DEFINE UseMIDIPort}
+{$ENDIF}
+
+
+{$IF Defined(win32)}
+  {$I config-win.inc}
+
+  // audio config
+  {$DEFINE WinAudioLib_BASS}
+  {$IFDEF WinAudioLib_BASS}
+    {$DEFINE UseBASSPlayback}
+    {$DEFINE UseBASSInput}
+  {$ELSE}
+    {$DEFINE UseFFMpegDecoder}
+    {$DEFINE HaveAvcodecDecodeAudio2}
+    {$DEFINE UsePortaudioPlayback}
+    {$DEFINE UsePortaudioInput}
+    {$DEFINE UsePortmixer}
+  {$ENDIF}
+  {$UNDEF WinAudioLib_BASS}
+
+  // video config
+  {$IFDEF HaveFFMpeg}
+    {$DEFINE UseFFMpegVideo}
+  {$ENDIF}
+  {$IFDEF HaveSWScale}
+    {$DEFINE UseSWScale}
+  {$ENDIF}
+
+  // misc defines
+
+  {$IF Defined(HaveProjectM_0_9)}
+    {$DEFINE UseProjectM_0_9}
+  {$ELSEIF Defined(HaveProjectM_1_0_PLUS)}
+    {$DEFINE UseProjectM_1_0_PLUS}
+  {$IFEND}
+
+  {$IFDEF DEBUG}
+    {$IFNDEF DARWIN}
+      {$APPTYPE CONSOLE}
+	{$ENDIF}
+  {$ENDIF}
+{$ELSEIF Defined(Linux)}
+  {$I config-linux.inc}
+
+  // audio config
+  {$IFDEF HaveFFMpeg}
+    {$DEFINE UseFFMpegDecoder}
+    {$IFDEF HavePortaudio}
+      {$DEFINE UsePortaudioPlayback}
+      {$DEFINE UsePortaudioInput}
+    {$ENDIF}
+  {$ENDIF}
+
+  // video config
+  {$IFDEF HaveFFMpeg}
+    {$DEFINE UseFFMpegVideo}
+  {$ENDIF}
+  {$IFDEF HaveSWScale}
+    {$DEFINE UseSWScale}
+  {$ENDIF}
+
+  // misc defines
+  {$IFDEF HaveProjectM}
+    {$DEFINE UseProjectM_0_9}
+  {$ENDIF}
+{$IFEND}
+
+{$IF Defined(UseFFMpegVideo) or Defined(UseFFMpegDecoder)}
+  {$DEFINE UseFFMpeg}
+{$IFEND}
+
+{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback)}
+  {$DEFINE UseBASS}
+{$IFEND}
+
+{$IF Defined(UsePortaudioInput) or Defined(UsePortaudioPlayback)}
+  {$DEFINE UsePortaudio}
+{$IFEND}
+
+{$IF Defined(UseProjectM_0_9) or Defined(UseProjectM_1_0_PLUS)}
+  {$DEFINE UseProjectM}
+{$IFEND}
+