Fixed compilation on the mac.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@972 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 136 insertions, 132 deletions

diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc
index 9b31f3af..1a8f26cc 100644
--- a/Game/Code/switches.inc
+++ b/Game/Code/switches.inc
@@ -1,132 +1,136 @@
-// 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}

-  {$DEFINE HasInline}

-  {$UNDEF UseSerialPort}

-{$ELSE}

-  {$DEFINE Delphi}

-

-  // Delphi version numbers (ignore versions released before Delphi 6 as they miss the $IF directive):

-  // Delphi 6 (VER140), Delphi 7 (VER150), Delphi 8 (VER160)

-  // Delphi 9/2005 (VER170), Delphi 10/2006 (VER180)

-

-  // the inline-procedure directive was introduced with Delphi 2005

-  {$IF not (Defined(VER140) or Defined(VER150) or Defined(VER160))}

-    {$DEFINE HasInline}

-  {$IFEND}

-

-  {$DEFINE DLL_STDCALL}

-  {$UNDEF UseSerialPort}

-{$ENDIF}

-

-

-{$IF Defined(win32)}

-  // include defines but no constants

-  {$I config-win.inc}

-

-  // audio config

-  {$DEFINE WinAudioLib_BASS}

-  {$IFDEF WinAudioLib_BASS}

-    {$DEFINE UseBASSPlayback}

-    {$DEFINE UseBASSInput}

-  {$ELSE}

-    {$DEFINE UseFFMpegDecoder}

-    //{$DEFINE UsePortaudioPlayback}

-    {$DEFINE UseSDLPlayback}

-    {$DEFINE UsePortaudioInput}

-    {$DEFINE UsePortmixer}

-  {$ENDIF}

-  {$UNDEF WinAudioLib_BASS}

-

-  // video config

-  {$IFDEF HaveFFMpeg}

-    {$DEFINE UseFFMpegVideo}

-    {$IFDEF HaveSWScale}

-      {$DEFINE UseSWScale}

-    {$ENDIF}

-  {$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}

-

-  {$IFDEF MSWINDOWS}

-    {$DEFINE UseMIDIPort}

-  {$ENDIF}

-{$ELSEIF Defined(Linux)}

-  // include defines but no constants

-  {$I config-linux.inc}

-

-  // audio config

-  {$IFDEF HaveFFMpeg}

-    {$DEFINE UseFFMpegDecoder}

-    {$IFDEF HavePortaudio}

-      //{$DEFINE UsePortaudioPlayback}

-      {$DEFINE UseSDLPlayback}

-      {$DEFINE UsePortaudioInput}

-    {$ENDIF}

-  {$ENDIF}

-

-  // video config

-  {$IFDEF HaveFFMpeg}

-    {$DEFINE UseFFMpegVideo}

-    {$IFDEF HaveSWScale}

-      {$DEFINE UseSWScale}

-    {$ENDIF}

-  {$ENDIF}

-

-  // misc defines

-  {$IFDEF HaveProjectM}

-    // this causes trouble at the moment

-    //{$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}

-

+// 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}
+  {$DEFINE HasInline}
+  {$UNDEF UseSerialPort}
+{$ELSE}
+  {$DEFINE Delphi}
+
+  // Delphi version numbers (ignore versions released before Delphi 6 as they miss the $IF directive):
+  // Delphi 6 (VER140), Delphi 7 (VER150), Delphi 8 (VER160)
+  // Delphi 9/2005 (VER170), Delphi 10/2006 (VER180)
+
+  // the inline-procedure directive was introduced with Delphi 2005
+  {$IF not (Defined(VER140) or Defined(VER150) or Defined(VER160))}
+    {$DEFINE HasInline}
+  {$IFEND}
+
+  {$DEFINE DLL_STDCALL}
+  {$UNDEF UseSerialPort}
+{$ENDIF}
+
+
+{$IF Defined(win32)}
+  // include defines but no constants
+	{$IFDEF DARWIN}
+    {$I config-macosx.inc}
+	{$ELSE}
+    {$I config-win.inc}
+	{$ENDIF}
+
+  // audio config
+  {$DEFINE WinAudioLib_BASS}
+  {$IFDEF WinAudioLib_BASS}
+    {$DEFINE UseBASSPlayback}
+    {$DEFINE UseBASSInput}
+  {$ELSE}
+    {$DEFINE UseFFMpegDecoder}
+    //{$DEFINE UsePortaudioPlayback}
+    {$DEFINE UseSDLPlayback}
+    {$DEFINE UsePortaudioInput}
+    {$DEFINE UsePortmixer}
+  {$ENDIF}
+  {$UNDEF WinAudioLib_BASS}
+
+  // video config
+  {$IFDEF HaveFFMpeg}
+    {$DEFINE UseFFMpegVideo}
+    {$IFDEF HaveSWScale}
+      {$DEFINE UseSWScale}
+    {$ENDIF}
+  {$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}
+
+  {$IFDEF MSWINDOWS}
+    {$DEFINE UseMIDIPort}
+  {$ENDIF}
+{$ELSEIF Defined(Linux)}
+  // include defines but no constants
+  {$I config-linux.inc}
+
+  // audio config
+  {$IFDEF HaveFFMpeg}
+    {$DEFINE UseFFMpegDecoder}
+    {$IFDEF HavePortaudio}
+      //{$DEFINE UsePortaudioPlayback}
+      {$DEFINE UseSDLPlayback}
+      {$DEFINE UsePortaudioInput}
+    {$ENDIF}
+  {$ENDIF}
+
+  // video config
+  {$IFDEF HaveFFMpeg}
+    {$DEFINE UseFFMpegVideo}
+    {$IFDEF HaveSWScale}
+      {$DEFINE UseSWScale}
+    {$ENDIF}
+  {$ENDIF}
+
+  // misc defines
+  {$IFDEF HaveProjectM}
+    // this causes trouble at the moment
+    //{$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}
+