Pulled arodlands fix

diff --git a/lib/SDL/Surface.pm b/lib/SDL/Surface.pm
index 49a2b29..a906047 100644 (file)
--- a/lib/SDL/Surface.pm
+++ b/lib/SDL/Surface.pm
@@ -203,14 +203,16 @@ sub flip {
 
 sub blit {
        if ($SDL::DEBUG) {
-               croak "SDL::Surface::blit does not accept undef use SDL::NULL" if ( !defined($_[1]) || !defined($_[3]) );
+               carp "/n SDL::Surface::blit accepting undef is depreceated use SDL::NULL" if ( !defined($_[1]) || !defined($_[3]) );
                croak "SDL::Surface::blit requires SDL::Rect objects"
                        unless ($_[1] == 0 || $_[1]->isa('SDL::Rect'))
                        && ($_[3] == 0 || $_[3]->isa('SDL::Rect'));
                croak "SDL::Surface::blit requires SDL::Surface objects"
                        unless $_[2]->isa('SDL::Surface'); 
        }
-       
+               
+               $_[1] = 0 unless defined $_[1];
+               $_[3] = 0 unless defined $_[3];
        SDL::BlitSurface(map { (defined($_) && $_ != 0)? ${$_} : $_ } @_) if defined(@_);
 }
 

diff --git a/make/lib/SDL/Build/Solaris.pm b/make/lib/SDL/Build/Solaris.pm
new file mode 100644 (file)
index 0000000..0a8ec4a
--- /dev/null
+++ b/make/lib/SDL/Build/Solaris.pm
@@ -0,0 +1,56 @@
+#!/usr/bin/env perl
+#
+# Linux.pm
+#
+# Copyright (C) 2005 David J. Goehrig <dgoehrig@cpan.org>
+#
+# ------------------------------------------------------------------------------
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ------------------------------------------------------------------------------
+#
+# Please feel free to send questions, suggestions or improvements to:
+#
+#      David J. Goehrig
+#      dgoehrig@cpan.org
+#
+
+package SDL::Build::Linux;
+
+use base 'SDL::Build';
+
+sub fetch_includes
+{
+       return (
+       '/usr/local/include'       => '/usr/local/lib',
+       '/usr/local/include/gl'    => '/usr/local/lib',
+       '/usr/local/include/GL'    => '/usr/local/lib',
+       '/usr/local/include/SDL'   => '/usr/local/lib',
+       '/usr/local/include/smpeg' => '/usr/local/lib',
+
+       '/usr/include'              => '/usr/lib',
+       '/usr/include/gl'           => '/usr/lib',
+       '/usr/include/GL'           => '/usr/lib',
+       '/usr/include/SDL'          => '/usr/lib',
+       '/usr/include/smpeg'        => '/usr/lib',
+
+       '/usr/X11R6/include'        => '/usr/X11R6/lib',
+       '/usr/X11R6/include/gl'     => '/usr/X11R6/lib',
+       '/usr/X11R6/include/GL'     => '/usr/X11R6/lib',
+       );
+}
+
+1;