Fixed v2.2.0

Changes:
Build.PL => have build in root dir
src/OpenGl.xs => modify #include for opengl and defines.h
src/SDL.xs => modify header defines.h location
src/SFont.xs => modify header defines.h location

diff --git a/Build.PL b/Build.PL
index 4a58923..6bed354 100644 (file)
--- a/Build.PL
+++ b/Build.PL
@@ -1,33 +1,8 @@
-#!/usr/bin/env perl
+#! perl -w
 #
-# Build.PL
-#
-# 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
-#
-
+# Copyright (C) 2003 chromatic 
+# Copyright (C) 2004 David J. Goehrig
+# Copyright (C) 2009 Kartik Thakore
 
 use strict;
 use warnings;
@@ -36,6 +11,7 @@ use lib  'make/lib';
 
 use SDL::Build;
 use YAML;
+use YAML::Node;
 
 my $sdl_compile_flags = `sdl-config --cflags`;
 my $sdl_link_flags    = `sdl-config --libs`;
@@ -43,7 +19,7 @@ my $sdl_link_flags    = `sdl-config --libs`;
 if ($? >> 8)
 {
        croak "SDL doesn't appear to be installed.\n" .
-       "Please check that sdl-config is in your path and try again.\n";
+               "Please check that sdl-config is in your path and try again.\n";
 }
 
 chomp( $sdl_compile_flags );
@@ -61,22 +37,22 @@ my %subsystems =
        SDL => {
                file      => {
                        from  => 'src/SDL.xs',
-                       to    => 'src/SDL_perl.xs',
+                       to    => './SDL_perl.xs',
                },
-               libraries => [qw( SDL SDL_image SDL_mixer SDL_sound SDL_net SDL_ttf 
-               SDL_gfx SDL_svg png jpeg smpeg )],
+               libraries => [qw( SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx
+                                 png jpeg smpeg )],
        },
        OpenGL => {
                file      => {
                        from => 'src/OpenGL.xs',
-                       to   => 'src/SDL/OpenGL.xs', 
+                       to   => 'SDL/OpenGL.xs', 
                },
                libraries => [qw( SDL GL GLU )],
        },
        SFont => {
                file    => {
                        from => 'src/SFont.xs',
-                       to   => 'src/SDL/SFont.xs',
+                       to   => 'SDL/SFont.xs',
                },
                libraries => [qw( SDL SDL_image )],
        },      
@@ -95,10 +71,6 @@ my %libraries = (
                define => 'HAVE_SDL_MIXER',   
                header => 'SDL_mixer.h'
        },
-       SDL_sound => {
-               define => 'HAVE_SDL_SOUND',
-               header => 'SDL_sound.h'
-       },
        SDL_net     => {
                define => 'HAVE_SDL_NET',     
                header => 'SDL_net.h'
@@ -111,10 +83,6 @@ my %libraries = (
                define => 'HAVE_SDL_GFX',     
                header => 'SDL_gfxPrimitives.h'
        },
-       SDL_svg => {
-               define => 'HAVE_SDL_SVG',
-               header => 'SDL_svg.h'
-       },
        png         => {
                define    => 'HAVE_PNG',
                header    => 'png.h',
@@ -141,8 +109,6 @@ my %libraries = (
 # see build/lib/SDL/Build/*pm
 my $arch          = SDL::Build->get_arch( $^O );
 
-print "[Build.PL] arch $arch\n";
-
 # see which subsystems can be built -- do we have headers for them?
 my $build_systems = $arch->find_subsystems( \%subsystems, \%libraries );
 
@@ -150,15 +116,15 @@ my $build_systems = $arch->find_subsystems( \%subsystems, \%libraries );
 $arch->write_sdl_config( $build_systems );
 
 # and fetch all of the information needed to compile
-my $defines    = $arch->build_defines( \%libraries, $build_systems );
-my $includes   = $arch->build_includes( \%libraries, $build_systems );
-my $links      = $arch->build_links( \%libraries, $build_systems );
+my $defines       = $arch->build_defines( \%libraries, $build_systems );
+my $includes      = $arch->build_includes( \%libraries, $build_systems );
+my $links         = $arch->build_links( \%libraries, $build_systems );
 
 # mangle the compilable files into a format Module::Build can understand
 my %xs = map { $subsystems{$_}{file}{from} => $subsystems{$_}{file}{to} }
-keys %subsystems;
-
+            keys %subsystems;
 my $build   = SDL::Build->new(
+       module_name          => 'SDL',
        dist_name            => 'SDL_Perl', 
        license              => 'lgpl',
        dist_version_from    => 'lib/SDL.pm',
@@ -171,18 +137,12 @@ my $build   = SDL::Build->new(
        {
                'Pod::ToDemo'  => '0.20',
        },
-       c_source => 'src',
+       c_source             => 'src',
        xs_files             => \%xs,
        dist_author          => 'David J. Goehrig <DGOEHRIG@cpan.org>',
 );
 
-if($arch eq 'Darwin')
-{
-       $build->{c_source} = $arch->build_c_source( \%libraries, $build_systems );
-       $build->{c_sources} = $arch->build_c_sources( \%libraries, $build_systems );
-       $build->{install_base} = $arch->build_install_base( \%libraries, $build_systems );
-
-}
+# and here's where the real (and ugly) magic works... see SDL::Build
 $build->set_flags(
        \%subsystems,
        $build_systems,

diff --git a/lib/SDL/Config.pm b/lib/SDL/Config.pm
index c75c9f7..8ca726b 100644 (file)
--- a/lib/SDL/Config.pm
+++ b/lib/SDL/Config.pm
@@ -29,7 +29,6 @@ $sdl_config = {
                                           '/usr/include/SDL',
                                           '/usr/lib'
                                         ],
-                           'SDL_svg' => 0,
                            'SDL_net' => [
                                           '/usr/include/SDL',
                                           '/usr/lib'
@@ -38,22 +37,18 @@ $sdl_config = {
                                             '/usr/include/SDL',
                                             '/usr/lib'
                                           ],
-                           'jpeg' => [
-                                       '/usr/include',
-                                       '/usr/lib'
-                                     ],
                            'SDL_gfx' => [
                                           '/usr/include/SDL',
                                           '/usr/lib'
                                         ],
+                           'jpeg' => [
+                                       '/usr/include',
+                                       '/usr/lib'
+                                     ],
                            'smpeg' => [
                                         '/usr/include/smpeg',
                                         '/usr/lib'
                                       ],
-                           'SDL_sound' => [
-                                            '/usr/include/SDL',
-                                            '/usr/lib'
-                                          ],
                            'SDL_mixer' => [
                                             '/usr/include/SDL',
                                             '/usr/lib'

diff --git a/src/OpenGL.xs b/src/OpenGL.xs
index 4c54228..13b3e58 100644 (file)
--- a/src/OpenGL.xs
+++ b/src/OpenGL.xs
@@ -37,8 +37,8 @@
 
 #include <SDL.h>
 
-#include <gl.h>
-#include <glu.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
 
 #ifdef USE_THREADS
 #define HAVE_TLS_CONTEXT
@@ -48,7 +48,7 @@
 #define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFF
 #endif /* GL_ALL_CLIENT_BITS */  
 
-#include "../defines.h"
+#include "../src/defines.h"
 
 SV* sdl_perl_nurbs_error_hook;
 void

diff --git a/src/SDL.xs b/src/SDL.xs
index c327e5e..599340d 100644 (file)
--- a/src/SDL.xs
+++ b/src/SDL.xs
@@ -97,7 +97,7 @@ static int sdl_perl_use_smpeg_audio = 0;
 #define HAVE_TLS_CONTEXT
 #endif
 
-#include "defines.h"
+#include "src/defines.h"
 
 Uint32 
 sdl_perl_timer_callback ( Uint32 interval, void* param )

diff --git a/src/SFont.xs b/src/SFont.xs
index 2bd9899..9fe5d42 100644 (file)
--- a/src/SFont.xs
+++ b/src/SFont.xs
@@ -44,8 +44,8 @@
 #define HAVE_TLS_CONTEXT
 #endif
 
-#include "../defines.h"
-#include "../SFont.h"
+#include "../src/defines.h"
+#include "../src/SFont.h"
 
 #ifdef HAVE_SDL_IMAGE
 #include <SDL_image.h>