6 files changed, 25 insertions, 27 deletions
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 45bbe281..b2ba9af2 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -159,7 +159,7 @@ uses
 
   UParty            in 'Classes\UParty.pas',            // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin
   UPlatform         in 'Classes\UPlatform.pas',
-{$IFDEF Windows}
+{$IFDEF MSWINDOWS}
   UPlatformWindows  in 'Classes\UPlatformWindows.pas',
 {$ENDIF}
 {$IFDEF LINUX}
diff --git a/Game/Code/lib/bass/delphi/bass.pas b/Game/Code/lib/bass/delphi/bass.pas
index cd348c22..c4588df8 100644
--- a/Game/Code/lib/bass/delphi/bass.pas
+++ b/Game/Code/lib/bass/delphi/bass.pas
@@ -11,10 +11,6 @@
 
 unit Bass;
 
-{$IFDEF DARWIN}
-  {$linklib libbass}
-{$ENDIF}
-
 interface
 
 {$IFDEF FPC}
@@ -666,6 +662,7 @@ const
 {$ENDIF}
 {$IFDEF DARWIN}
   bassdll = 'libbass.dylib';
+  {$linklib libbass}
 {$ENDIF}
 
 function BASS_SetConfig(option, value: DWORD): BOOL; {$IFDEF DLL_STDCALL}stdcall;{$ENDIF}{$IFDEF DLL_CDECL}cdecl;{$ENDIF} external bassdll;
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index 9115d6ae..720103d6 100644
--- a/Game/Code/lib/ffmpeg/avformat.pas
+++ b/Game/Code/lib/ffmpeg/avformat.pas
@@ -37,6 +37,8 @@ unit avformat;
   {$MINENUMSIZE 4} (* use 4-byte enums *)
 {$ENDIF}
 
+{$I switches.inc}  (* for the HasInline define *)
+
 {$IFDEF DARWIN}
   {$linklib libavformat}
 {$ENDIF}
diff --git a/Game/Code/lib/libpng/png.pas b/Game/Code/lib/libpng/png.pas
index 9787c913..d997451f 100644
--- a/Game/Code/lib/libpng/png.pas
+++ b/Game/Code/lib/libpng/png.pas
@@ -9,10 +9,6 @@
   {$endif}
 {$ENDIF}
 
-{$IFDEF DARWIN}
-  {$linklib libpng}
-{$ENDIF}
-
 unit png;
 
 interface
@@ -32,7 +28,7 @@ uses
   zlib;
 
 const
-{$ifdef MSWINDOWS}
+{$IFDEF MSWINDOWS}
   // use libpng12-0 (Version 1.2.18), delivered wih SDL_Image
   LibPng = 'libpng12-0'; // 'libpng13';
   // matching lib version for libpng13.dll, needed for initialization
@@ -40,26 +36,29 @@ const
   // define the compiler that was used to built the DLL (necessary for jmp_buf)
   // SDL_Image was compiled with GCC
   //{$define MSVC_DLL} // MS Visual C++
-  {$define GCC_DLL}  // GCC
-{$else}
+  {$DEFINE GCC_DLL}  // GCC
+{$ELSE}
   LibPng = 'png';
   // matching lib version for libpng, needed for initialization
   PNG_LIBPNG_VER_STRING='1.2.12';
-{$endif}
+  {$IFDEF DARWIN}
+    {$linklib libpng}
+  {$ENDIF}
+{$ENDIF}
 
 
-{$ifdef MSWINDOWS}
+{$IFDEF MSWINDOWS}
 const
    // JB_LEN (#elements in jmp_buf) depends on the compiler used to compile the DLL
    //   MSVC++: 16 (x86/AMD64), GCC: 52
-   {$if Defined(MSVC_DLL)}
+   {$IF Defined(MSVC_DLL)}
    JB_LEN = 16;
-   {$elseif Defined(GCC_DLL)}
+   {$ELSEIF Defined(GCC_DLL)}
    JB_LEN = 52;
-   {$else}
+   {$ELSE}
    JB_LEN = 0;
-   {$ifend}
-{$endif}
+   {$IFEND}
+{$ENDIF}
 
 type
    {$IFNDEF FPC}
diff --git a/Game/Code/lib/zlib/zlib.pas b/Game/Code/lib/zlib/zlib.pas
index 91eb47df..c1e21a4c 100644
--- a/Game/Code/lib/zlib/zlib.pas
+++ b/Game/Code/lib/zlib/zlib.pas
@@ -25,12 +25,11 @@ const
   libz = 'zlib1';
 {$else}
   libz = 'z';
+  {$IFDEF DARWIN}
+    {$linklib libz}
+  {$ENDIF}
 {$endif}
 
-{$IFDEF DARWIN}
-  {$linklib libz}
-{$ENDIF}
-
 type
   { Compatible with paszlib }
   Uint    = Cardinal;
diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc
index 5ba4bb7a..f507796d 100644
--- a/Game/Code/switches.inc
+++ b/Game/Code/switches.inc
@@ -41,7 +41,7 @@
   {$I config-win.inc}
 
   // enable debug-mode. For development only!
-  //{$DEFINE DEBUG}
+  {.$DEFINE DEBUG}
   {$IFDEF DEBUG}
     // windows apps are either GUI- or console-apps. Console-apps will open
     // an additional console-window for output. For development only!
@@ -57,7 +57,7 @@
 
   // use "configure --enable-debug", "make debug" or
   // the command-line parameter "-debug" instead of defining DEBUG directly
-  //{$DEFINE DEBUG}
+  {.$DEFINE DEBUG}
   // linux apps are always console-apps so leave this defined.
   {$DEFINE CONSOLE}
 {$ELSEIF Defined(DARWIN)}
@@ -65,8 +65,9 @@
   {$I config-darwin.inc}
 
   // enable debug-mode. For development only!
-  //{$DEFINE DEBUG}
+  {.$DEFINE DEBUG}
   {$DEFINE CONSOLE}
+  {.$DEFINE HaveBASS}
   {$DEFINE UTF8_FILENAMES}
 {$IFEND}
 
@@ -75,7 +76,7 @@
   {$DEFINE UseBASSPlayback}
   {$DEFINE UseBASSInput}
 {$ELSEIF Defined(HavePortaudio)}
-  //{$DEFINE UsePortaudioPlayback}
+  {.$DEFINE UsePortaudioPlayback}
   {$DEFINE UseSDLPlayback}
   {$DEFINE UsePortaudioInput}
   {$IFDEF HavePortmixer}