Mac OS X version compiles and links. I hope I didn't break too many files on windows/linux.

Added switches.inc to all files.
Changed many IFDEFs.
For Windows-only code please use MSWINDOWS instead of WIN32 now. WIN32 is also used by the Mac port.

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

1 files changed, 43 insertions, 19 deletions

diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc
index 578271c0..1e1d4cad 100644
--- a/Game/Code/switches.inc
+++ b/Game/Code/switches.inc
@@ -1,19 +1,43 @@
-{$DEFINE DEBUG} // to-do : Remove b4 release

-

-{$IFDEF FPC}

-  {$UNDEF UseSerialPort}

-  {$UNDEF UseMIDIPort}

-{$ELSE}

-  {$UNDEF UseSerialPort}

-  {$DEFINE UseMIDIPort}

-{$ENDIF}

-

-{$IFDEF win32}

-  {$DEFINE UseBASS}

-  {$IFDEF DEBUG}

-    {$APPTYPE CONSOLE}

-  {$ENDIF}

-{$ELSE}

-  {$UNDEF  UseBASS}

-{$ENDIF}

-

+{$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}
+  {$ELSE}
+    {$DEFINE LAZARUS}	
+  {$ENDIF}
+
+  {$MODE DELPHI}
+  {$DEFINE DLL_CDECL}
+  {$UNDEF UseSerialPort}
+  {$UNDEF UseMIDIPort}
+{$ELSE}
+  {$DEFINE DLL_STDCALL}
+  {$UNDEF UseSerialPort}
+  {$DEFINE UseMIDIPort}
+{$ENDIF}
+
+
+{$IFDEF win32}
+  {$DEFINE UseBASS}
+  {$IFDEF DEBUG}
+    {$IFNDEF DARWIN}
+      {$APPTYPE CONSOLE}
+	{$ENDIF}
+  {$ENDIF}
+{$ELSE}
+  {$UNDEF  UseBASS}
+{$ENDIF}
+