6 files changed, 12 insertions, 9 deletions
diff --git a/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc b/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
index fed972b5..31817d24 100644
--- a/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
+++ b/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
@@ -332,7 +332,7 @@
   {$ELSE}
      {$DEFINE __OS_DOS__}
   {$ENDIF}
-  {$IFDEF WIN32}
+  {$IFDEF MSWINDOWS}
    {$DEFINE UseWin}
   {$ENDIF}
   {$DEFINE HAS_TYPES}
@@ -380,13 +380,13 @@
   {$OA+} // Objects and structures align
 {$ENDIF}
 
-{$IFDEF Win32}
+{$IFDEF MSWINDOWS}
   {$DEFINE OS_BigMem}
-{$ELSE Win32}
+{$ELSE MSWINDOWS}
   {$IFDEF ver70}
     {$DEFINE assembler}
   {$ENDIF} { use 16-bit assembler! }
-{$ENDIF Win32}
+{$ENDIF MSWINDOWS}
 
 { ************************** dos/dos-like platforms **************}
 {$IFDEF Windows}
diff --git a/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas b/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
index ea4f220c..796aa0ab 100644
--- a/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
+++ b/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
@@ -59,7 +59,7 @@ interface
 
 // each OS gets its own IFDEFed complete code block to make reading easier
 
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
 uses
   Windows;
 
diff --git a/src/lib/JEDI-SDL/SDL/Pas/sdl.pas b/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
index 0d7e46af..6a9ad14b 100644
--- a/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
+++ b/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
@@ -367,10 +367,13 @@ const
 {$ENDIF}
 
 {$IFDEF UNIX}
+{$macro on}
+{$IF (6 <= 6)}
+{$ENDIF}
 {$IFDEF DARWIN}
   SDLLibName = 'libSDL-1.2.0.dylib';
   {$linklib libSDL-1.2.0}
-  {$linklib gcc}
+//  {$linklib gcc}
   {$linklib SDLmain}
   {$linkframework Cocoa}
   {$PASCALMAINNAME SDL_main}
diff --git a/src/lib/TntUnicodeControls/TntCompilers.inc b/src/lib/TntUnicodeControls/TntCompilers.inc
index 06f4d9ab..90b51ef2 100644
--- a/src/lib/TntUnicodeControls/TntCompilers.inc
+++ b/src/lib/TntUnicodeControls/TntCompilers.inc
@@ -63,7 +63,7 @@
 // QT_CLX      : Trolltech's QT library is being used.
 //----------------------------------------------------------------------------------------------------------------------
 
-{$ifdef Win32}
+{$ifdef MSWINDOWS}
 
   {$ifdef VER180}
     {$define COMPILER_10}
diff --git a/src/lib/midi/Midiin.pas b/src/lib/midi/Midiin.pas
index 66e4f76d..2ce4e3f5 100644
--- a/src/lib/midi/Midiin.pas
+++ b/src/lib/midi/Midiin.pas
@@ -237,7 +237,7 @@ uses Controls,
   There are special requirements and restrictions for this callback
   procedure (see midiInOpen in MMSYSTEM.HLP) so it's impractical to
   make it an object method }
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
 function midiHandler(
     hMidiIn: HMidiIn;
     wMsg: UINT;
diff --git a/src/lib/midi/Midiout.pas b/src/lib/midi/Midiout.pas
index 98e6e3fb..1f9fb1f6 100644
--- a/src/lib/midi/Midiout.pas
+++ b/src/lib/midi/Midiout.pas
@@ -234,7 +234,7 @@ implementation
   There are special requirements and restrictions for this callback
   procedure (see midioutOpen in MMSYSTEM.HLP) so it's impractical to
   make it an object method }
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
 function midiHandler(
     hMidiIn: HMidiIn;
     wMsg: UINT;