diff --git a/src/lib/sdl2/sdl2.pas b/src/lib/sdl2/sdl2.pas
index 92f71d93376678ee60c0049ab7c6c0c794c9808a..6e77ca2b1fe785a6338ffebba7131e488ccca582 100644 (file)
--- a/src/lib/sdl2/sdl2.pas
+++ b/src/lib/sdl2/sdl2.pas
+{$MODE DELPHI}
unit SDL2;
{
unit SDL2;
{
Windows;
{$ENDIF}
Windows;
{$ENDIF}
- {$IFDEF LINUX}
- uses
- X,
- XLib;
+ {$IF DEFINED(UNIX)}
+ {$IF NOT DEFINED(HAIKU) AND NOT DEFINED(ANDROID)}
+ uses
+ X,
+ XLib;
+ {$ENDIF}
{$ENDIF}
{$ENDIF}
-
+
{$IFDEF DARWIN}
uses
X,
{$IFDEF DARWIN}
uses
X,
SDL_LibName = 'SDL2.dll';
{$ENDIF}
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}
{$IFDEF DARWIN}
SDL_LibName = 'libSDL2.dylib';
{$ELSE}
//from "sdl_mouse.h"
function SDL_Button(button: SInt32): SInt32;
begin
//from "sdl_mouse.h"
function SDL_Button(button: SInt32): SInt32;
begin
- Result := 1 shl (button - 1);
+ Result := 1 shl (button - 1);
end;
{$IFDEF WINDOWS}
end;
{$IFDEF WINDOWS}
@@ -303,7 +308,7 @@ function SDL_LoadWAV(_file: PAnsiChar; spec: PSDL_AudioSpec; audio_buf: PPUInt8;
begin
Result := SDL_LoadWAV_RW(SDL_RWFromFile(_file, 'rb'), 1, spec, audio_buf, audio_len);
end;
begin
Result := SDL_LoadWAV_RW(SDL_RWFromFile(_file, 'rb'), 1, spec, audio_buf, audio_len);
end;
-
+
function SDL_AUDIO_BITSIZE(x: Cardinal): Cardinal;
begin
Result := x and SDL_AUDIO_MASK_BITSIZE;
function SDL_AUDIO_BITSIZE(x: Cardinal): Cardinal;
begin
Result := x and SDL_AUDIO_MASK_BITSIZE;
//from "sdl_pixels.h"
//from "sdl_pixels.h"
-function SDL_PIXELFLAG(X: Cardinal): Boolean;
+function SDL_PIXELFLAG(X: Cardinal): Cardinal;
begin
begin
- Result := (X shr 28) = $0F;
+ Result := (X shr 28) and $0F;
end;
end;
-function SDL_PIXELTYPE(X: Cardinal): Boolean;
+function SDL_PIXELTYPE(X: Cardinal): Cardinal;
begin
begin
- Result := (X shr 24) = $0F;
+ Result := (X shr 24) and $0F;
end;
end;
-function SDL_PIXELORDER(X: Cardinal): Boolean;
+function SDL_PIXELORDER(X: Cardinal): Cardinal;
begin
begin
- Result := (X shr 20) = $0F;
+ Result := (X shr 20) and $0F;
end;
end;
-function SDL_PIXELLAYOUT(X: Cardinal): Boolean;
+function SDL_PIXELLAYOUT(X: Cardinal): Cardinal;
begin
begin
- Result := (X shr 16) = $0F;
+ Result := (X shr 16) and $0F;
end;
end;
-function SDL_BITSPERPIXEL(X: Cardinal): Boolean;
+function SDL_BITSPERPIXEL(X: Cardinal): Cardinal;
begin
begin
- Result := (X shr 8) = $FF;
+ Result := (X shr 8) and $FF;
end;
function SDL_IsPixelFormat_FOURCC(format: Variant): Boolean;
end;
function SDL_IsPixelFormat_FOURCC(format: Variant): Boolean;