fix 16/32 bit and float wav formats for openal

[d2df-sdl.git] / src / lib / sdl2 / sdl2.pas

diff --git a/src/lib/sdl2/sdl2.pas b/src/lib/sdl2/sdl2.pas
index 168742e872eb3b411f2d7060755c914e5aa15251..d5bb58e2529905e3afaf1307b3bf0a57689d3dc3 100644 (file)
--- a/src/lib/sdl2/sdl2.pas
+++ b/src/lib/sdl2/sdl2.pas
@@ -137,16 +137,16 @@ interface
       Windows;
   {$ENDIF}
 
-  {$IFDEF UNIX}
-    uses
-      X,
-      XLib;
+  {$IF DEFINED(UNIX)}
+    {$IF NOT DEFINED(HAIKU) AND NOT DEFINED(ANDROID) AND NOT DEFINED(DARWIN)}
+      uses
+        X,
+        XLib;
+    {$ENDIF}
   {$ENDIF}
 
   {$IFDEF DARWIN}
     uses
-      X,
-      XLib,
       CocoaAll;
   {$ENDIF}
 
@@ -156,7 +156,9 @@ const
     SDL_LibName = 'SDL2.dll';
   {$ENDIF}
 
-  {$IFDEF UNIX}
+  {$IF DEFINED(HAIKU)}
+    SDL_LibName = 'libSDL2.so.0';
+  {$ELSEIF DEFINED(UNIX)}
     {$IFDEF DARWIN}
       SDL_LibName = 'libSDL2.dylib';
     {$ELSE}
@@ -210,6 +212,7 @@ const
 {$I sdlfilesystem.inc}
 {$I sdllog.inc}
 {$I sdlsystem.inc}
+{$I sdlstdinc.inc}
 {$I sdl.inc}
 
 implementation