X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=make%2Flib%2FSDL%2FBuild%2FMSWin32.pm;h=957d7e591dbcfc38ebc50e586941437e85f9d844;hb=99734ed6b24aec67352f63ac6d27976a3c8cfab5;hp=d1dcbbb7416aa5186b057ef91efaf85e2e8550aa;hpb=7b6a53a1f5064ca5b8ab0243f7bcf6209e6bf5a4;p=sdlgit%2FSDL_perl.git diff --git a/make/lib/SDL/Build/MSWin32.pm b/make/lib/SDL/Build/MSWin32.pm index d1dcbbb..957d7e5 100644 --- a/make/lib/SDL/Build/MSWin32.pm +++ b/make/lib/SDL/Build/MSWin32.pm @@ -32,21 +32,23 @@ package SDL::Build::MSWin32; use strict; use warnings; -usr Carp; +use Carp; use base 'SDL::Build'; use File::Spec::Functions; sub fetch_includes -{ - croak "Environment variable INCLUDE is empty\n" unless $ENV{INCLUDE}; +{ - return map { $_ => 1 } grep { $_ } split( ';', $ENV{INCLUDE} ); + warn "Environment variable INCLUDE is empty\n" unless $ENV{INCLUDE}; + return map { $_ => 1 } grep { $_ } split( ';', $ENV{INCLUDE} ) if $ENV{INCLUDE}; + return '-I.'; } sub find_header { for my $key (qw( LIBS PATH )) { + #this needs to be carp because some users will have SDL libs in same folder carp "Environment variable $key is empty\n" unless $ENV{$key}; carp "This will probably fail the compile \nSet $key manually or try building anyway\n" unless $ENV{$key}; } @@ -106,11 +108,10 @@ sub gl_vendor my ( $self, $vendor ) = @_; return 'ms_gl' unless defined $vendor; - return 'mesa_gl' if $vendor eq 'MESA'; return 'ms_gl' if $vendor eq 'MS'; - croak "Unrecognized GL vendor '$vendor'\n"; + } sub ms_gl_subsystems @@ -148,4 +149,28 @@ sub link_c $self->SUPER::link_c( @_ ); } +sub sdl_libs +{ + my $self = shift; + my $sdl_inst_dir = shift; + + +} + +sub alt_link_flags +{ + my $self = shift; + my $sdl_dir = shift; + + return $self->SUPER::alt_link_flags($sdl_dir).' -lmingw32 -mwindows -lSDLmain -lSDL.dll'; +} + +sub alt_compile_flags +{ + my $self = shift; + my $sdl_dir = shift; + + return $self->SUPER::alt_compile_flags($sdl_dir).' -D_GNU_SOURCE=1 -Dmain=SDL_main'; +} + 1;