X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Flib%2Fsdl2%2Fsdl2.pas;h=ab47a820b9cb7590e15d535f76a873d47dbfdf48;hb=1aabd118ca7663db8646c6ee9ac07b35fc3fb51b;hp=4f1dfcaa0ac320d8801649d1d2331a6a67d9a867;hpb=a2e293a0411a842370664272697718994adbf3df;p=d2df-sdl.git diff --git a/src/lib/sdl2/sdl2.pas b/src/lib/sdl2/sdl2.pas index 4f1dfca..ab47a82 100644 --- a/src/lib/sdl2/sdl2.pas +++ b/src/lib/sdl2/sdl2.pas @@ -1,3 +1,4 @@ +{$MODE DELPHI} unit SDL2; { @@ -136,12 +137,14 @@ interface Windows; {$ENDIF} - {$IFDEF LINUX} - 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, @@ -155,7 +158,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} @@ -241,7 +246,7 @@ end; //from "sdl_mouse.h" function SDL_Button(button: SInt32): SInt32; begin - Result := 1 shl (button - 1); + Result := 1 shl (button - 1); 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; - + function SDL_AUDIO_BITSIZE(x: Cardinal): Cardinal; begin Result := x and SDL_AUDIO_MASK_BITSIZE;