Skip to content

bundle SDL2.dll directly in repo #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

bundle SDL2.dll directly in repo #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f14b6b
Find and use bundled SDL2.dll
retupmoca Apr 4, 2015
7eb54f4
Installed bundled SDL2.dll if needed
retupmoca Apr 4, 2015
119b456
Bundle .dll with repo
retupmoca Apr 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions Build.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
use Panda::Builder;

use Shell::Command;
use NativeCall;

# test sub for system library
our sub testlib() is native('SDL2.dll') { * }

class Build is Panda::Builder {
method build($workdir) {
my $need-copy = False;

# we only have .dll files bundled. Non-windows is assumed to have openssl already
if $*DISTRO.is-win {
testlib();
CATCH {
default {
$need-copy = True if $_.payload ~~ m:s/Cannot locate/;
}
}
}

if $need-copy {
say 'No system SDL library detected. Installing bundled version.';
mkdir($workdir ~ '\blib\lib\SDL2');
cp($workdir ~ '\native-lib\SDL2.dll', $workdir ~ '\blib\lib\SDL2\SDL2.dll');
}
else {
say 'Found system SDL library.';
}
}
}
128 changes: 75 additions & 53 deletions lib/SDL2/Raw.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,34 @@
use NativeCall;

my Str $lib;
BEGIN {
if $*VM.config<dll> ~~ /dll/ {
$lib = 'SDL2';
} else {
$lib = 'libSDL2';
sub find-bundled($lib is copy) {
# if we can't find one, assume there's a system install
my $base = "lib/SDL2/$lib";
for @*INC {
if my @files = ($_.files($base) || $_.files("blib/$base")) {
my $files = @files[0]<files>;
my $tmp = $files{$base} || $files{"blib/$base"};

# copy to a temp dir
$tmp.IO.copy($*SPEC.tmpdir ~ '\\' ~ $lib);
$lib = $*SPEC.tmpdir ~ '\\' ~ $lib;

last;
}
}

$lib;
}

sub sdl-lib {
state $lib;
unless $lib {
if $*VM.config<dll> ~~ /dll/ {
$lib = find-bundled('SDL2.dll');
} else {
$lib = 'libSDL2';
}
}
$lib;
}

class SDL_Point is repr('CStruct') {
Expand Down Expand Up @@ -39,8 +61,8 @@ enum SDL_INIT (
:NOPARACHUTE(0x100000)
);

sub SDL_Init(int32 $flags) is native($lib) is export {*}
sub SDL_Quit() is native($lib) is export {*}
sub SDL_Init(int32 $flags) is native(&sdl-lib) is export {*}
sub SDL_Quit() is native(&sdl-lib) is export {*}

class SDL_Window is repr('CPointer') { }

Expand Down Expand Up @@ -124,122 +146,122 @@ class SDL_Texture is repr('CPointer') { }

sub SDL_GetNumRenderDrivers()
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_GetRenderDriverInfo(int $index, SDL_RendererInfo $info)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_CreateWindowAndRenderer(int $width, int $height,
int32 $flags,
CArray[SDL_Window] $win, CArray[SDL_Renderer] $renderer)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_CreateRenderer(SDL_Window $win, int $index, int32 $flags)
returns SDL_Renderer
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_CreateTexture(SDL_Renderer $renderer, int32 $format, int $access, int $w, int $h)
returns SDL_Texture
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_SetRenderTarget(SDL_Renderer $renderer, SDL_Texture $texture)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_UpdateTexture(SDL_Texture $tex, SDL_Rect $rect, OpaquePointer $data, int32 $pitch)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_SetTextureBlendMode(SDL_Texture $tex, int $blendmode)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_GetTextureBlendMode(SDL_Texture $tex, CArray[int] $blendmode)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_RenderSetLogicalSize(SDL_Renderer $renderer, int $w, int $h)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_RenderGetLogicalSize(SDL_Renderer $renderer, CArray[int] $w, CArray[int] $h)
is native($lib)
is native(&sdl-lib)
is export {*}

sub SDL_SetRenderDrawColor(SDL_Renderer $renderer, int8 $r, int8 $g, int8 $b, int8 $a)
returns int
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_SetTextureColorMod(SDL_Texture $texture, int8 $r, int8 $g, int8 $b) returns int32 is native($lib) is export {*}
sub SDL_SetTextureColorMod(SDL_Texture $texture, int8 $r, int8 $g, int8 $b) returns int32 is native(&sdl-lib) is export {*}

sub SDL_GetRenderDrawColor(SDL_Renderer $renderer, CArray[uint8] $r, CArray[uint8] $g, CArray[uint8] $b, CArray[uint8] $a) returns int is native($lib) is export {*}
sub SDL_GetRenderDrawColor(SDL_Renderer $renderer, CArray[uint8] $r, CArray[uint8] $g, CArray[uint8] $b, CArray[uint8] $a) returns int is native(&sdl-lib) is export {*}

sub SDL_SetRenderDrawBlendMode(SDL_Renderer $renderer, int $blendmode)
is native($lib)
is native(&sdl-lib)
is export
{*}

sub SDL_RenderCopy(SDL_Renderer $renderer, SDL_Texture $src, SDL_Rect $srcrect, SDL_Rect $destrect) returns int is native($lib) is export {*}
sub SDL_RenderCopyEx(SDL_Renderer $renderer, SDL_Texture $src, SDL_Rect $srcrect, SDL_Rect $destrect, num $angle, SDL_Point $center, int $flip) returns int is native($lib) is export {*}
sub SDL_RenderCopy(SDL_Renderer $renderer, SDL_Texture $src, SDL_Rect $srcrect, SDL_Rect $destrect) returns int is native(&sdl-lib) is export {*}
sub SDL_RenderCopyEx(SDL_Renderer $renderer, SDL_Texture $src, SDL_Rect $srcrect, SDL_Rect $destrect, num $angle, SDL_Point $center, int $flip) returns int is native(&sdl-lib) is export {*}

sub SDL_RenderClear(SDL_Renderer $renderer) returns int is native($lib) is export {*}
sub SDL_RenderPresent(SDL_Renderer $renderer) is native($lib) is export {*}
sub SDL_RenderClear(SDL_Renderer $renderer) returns int is native(&sdl-lib) is export {*}
sub SDL_RenderPresent(SDL_Renderer $renderer) is native(&sdl-lib) is export {*}

sub SDL_RenderDrawPoint(SDL_Renderer $renderer, int $x, int $y) returns int is native($lib) is export {*}
sub SDL_RenderDrawLine(SDL_Renderer $renderer, int $x, int $y, int $x2, int $y2) returns int is native($lib) is export {*}
sub SDL_RenderDrawPoint(SDL_Renderer $renderer, int $x, int $y) returns int is native(&sdl-lib) is export {*}
sub SDL_RenderDrawLine(SDL_Renderer $renderer, int $x, int $y, int $x2, int $y2) returns int is native(&sdl-lib) is export {*}

sub SDL_RenderDrawRect(SDL_Renderer $renderer, SDL_Rect $rect) returns int is native($lib) is export {*}
sub SDL_RenderFillRect(SDL_Renderer $renderer, SDL_Rect $rect) returns int is native($lib) is export {*}
sub SDL_RenderDrawRect(SDL_Renderer $renderer, SDL_Rect $rect) returns int is native(&sdl-lib) is export {*}
sub SDL_RenderFillRect(SDL_Renderer $renderer, SDL_Rect $rect) returns int is native(&sdl-lib) is export {*}

sub SDL_DestroyTexture(SDL_Texture $texture) is native($lib) is export {*}
sub SDL_DestroyRenderer(SDL_Renderer $renderer) is native($lib) is export {*}
sub SDL_DestroyTexture(SDL_Texture $texture) is native(&sdl-lib) is export {*}
sub SDL_DestroyRenderer(SDL_Renderer $renderer) is native(&sdl-lib) is export {*}

sub SDL_GL_BindTexture(SDL_Texture $texture, CArray[num] $texw, CArray[num] $texh) returns int is native($lib) is export {*}
sub SDL_GL_UnBindTexture(SDL_Texture $texture) returns int is native($lib) is export {*}
sub SDL_GL_BindTexture(SDL_Texture $texture, CArray[num] $texw, CArray[num] $texh) returns int is native(&sdl-lib) is export {*}
sub SDL_GL_UnBindTexture(SDL_Texture $texture) returns int is native(&sdl-lib) is export {*}

sub SDL_VideoInit(Str $drivername) returns int is native($lib) is export {*}
sub SDL_VideoQuit() is native($lib) is export {*}
sub SDL_VideoInit(Str $drivername) returns int is native(&sdl-lib) is export {*}
sub SDL_VideoQuit() is native(&sdl-lib) is export {*}

sub SDL_GetNumVideoDrivers() returns int is native($lib) is export {*}
sub SDL_GetVideoDriver(int $index) returns Str is native($lib) is export {*}
sub SDL_GetCurrentVideoDriver() returns Str is native($lib) is export {*}
sub SDL_GetNumVideoDrivers() returns int is native(&sdl-lib) is export {*}
sub SDL_GetVideoDriver(int $index) returns Str is native(&sdl-lib) is export {*}
sub SDL_GetCurrentVideoDriver() returns Str is native(&sdl-lib) is export {*}

sub SDL_GetNumVideoDisplays() returns int is native($lib) is export {*}
sub SDL_GetDisplayName(int $index) returns Str is native($lib) is export {*}
sub SDL_GetDisplayBounds(int $index, SDL_Rect $rect) returns int is native($lib) is export {*}
sub SDL_GetNumVideoDisplays() returns int is native(&sdl-lib) is export {*}
sub SDL_GetDisplayName(int $index) returns Str is native(&sdl-lib) is export {*}
sub SDL_GetDisplayBounds(int $index, SDL_Rect $rect) returns int is native(&sdl-lib) is export {*}

sub SDL_CreateWindow(Str $title, int $x, int $y, int $w, int $h, int32 $flags) returns SDL_Window is native($lib) is export {*}
sub SDL_SetWindowTitle(SDL_Window $window, Str $title) returns Str is native($lib) is export {*}
sub SDL_GetWindowTitle(SDL_Window $window) returns Str is native($lib) is export {*}
sub SDL_CreateWindow(Str $title, int $x, int $y, int $w, int $h, int32 $flags) returns SDL_Window is native(&sdl-lib) is export {*}
sub SDL_SetWindowTitle(SDL_Window $window, Str $title) returns Str is native(&sdl-lib) is export {*}
sub SDL_GetWindowTitle(SDL_Window $window) returns Str is native(&sdl-lib) is export {*}

sub SDL_UpdateWindowSurface(SDL_Window $window) returns int is native($lib) is export {*}
sub SDL_UpdateWindowSurface(SDL_Window $window) returns int is native(&sdl-lib) is export {*}

sub SDL_SetWindowGrab(SDL_Window $window, int $grabbed) is native($lib) is export {*}
sub SDL_GetWindowGrab(SDL_Window $window) returns int is native($lib) is export {*}
sub SDL_SetWindowGrab(SDL_Window $window, int $grabbed) is native(&sdl-lib) is export {*}
sub SDL_GetWindowGrab(SDL_Window $window) returns int is native(&sdl-lib) is export {*}


enum SDL_EventType (
Expand Down Expand Up @@ -370,9 +392,9 @@ class SDL_MouseWheelEvent is repr('CStruct') {
has int32 $.y;
}

sub SDL_PollEvent(SDL_Event $event) returns int32 is native($lib) is export {*}
sub SDL_WaitEvent(SDL_Event $event) returns int32 is native($lib) is export {*}
sub SDL_WaitEventTimeout(SDL_Event $event, int32 $timeout) returns int32 is native($lib) is export {*}
sub SDL_PollEvent(SDL_Event $event) returns int32 is native(&sdl-lib) is export {*}
sub SDL_WaitEvent(SDL_Event $event) returns int32 is native(&sdl-lib) is export {*}
sub SDL_WaitEventTimeout(SDL_Event $event, int32 $timeout) returns int32 is native(&sdl-lib) is export {*}

sub SDL_CastEvent(SDL_Event $event) is export {
given $event.type {
Expand Down Expand Up @@ -402,7 +424,7 @@ our constant SDL_IGNORE = 0;
our constant SDL_DISABLE = 0;
our constant SDL_ENABLE = 1;

sub SDL_EventState(int32 $type, int32 $state) returns uint8 is native($lib) is export {*}
sub SDL_EventState(int32 $type, int32 $state) returns uint8 is native(&sdl-lib) is export {*}

my sub _pxfmt($type, $order, $layout, $bits, $bytes) {
(1 +< 28) +| ($type +< 24) +| ($order +< 20) +| ($layout +< 16) +| ($bits +< 8) +| $bytes
Expand Down
Binary file added native-lib/SDL2.dll
View file
Open in desktop
Binary file not shown.