Mixer fix up to check Config before testign or compiling

PerlGameDev · Dec 1, 2009 · 8a89f42 · 8a89f42
1 parent c1bddb5
commit 8a89f42
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 9 deletions.
diff --git a/src/Mixer/objects/MixChunk.xs b/src/Mixer/objects/MixChunk.xs
@@ -7,7 +7,10 @@
 #endif
 
 #include <SDL.h>
+
+#ifdef HAVE_SDL_MIXER
 #include <SDL_mixer.h>
+#endif
 
 MODULE = SDL::Mixer::MixChunk 	PACKAGE = SDL::Mixer::MixChunk    PREFIX = mixchunk_
 
@@ -24,6 +27,8 @@ SDL_MixChunk - Stores audio data in memory
 
 =cut
 
+#ifdef HAVE_SDL_MIXER
+
 Uint32
 mixchunk_alen ( mixchunk )
 	Mix_Chunk *mixchunk
@@ -46,3 +51,5 @@ mixchunk_DESTROY(mixchunk)
 	Mix_Chunk *mixchunk
 	CODE:
 		Mix_FreeChunk(mixchunk);
+
+#endif
diff --git a/src/Mixer/objects/MixMusic.xs b/src/Mixer/objects/MixMusic.xs
@@ -7,7 +7,10 @@
 #endif
 
 #include <SDL.h>
+
+#ifdef HAVE_SDL_MIXER
 #include <SDL_mixer.h>
+#endif
 
 MODULE = SDL::Mixer::MixMusic 	PACKAGE = SDL::Mixer::MixMusic    PREFIX = mixmusic_
 
@@ -19,8 +22,12 @@ SDL_mixmusic - This is an opaque data type used for Music data
 
 =cut
 
+#ifdef HAVE_SDL_MIXER
+
 void
 mixmusic_DESTROY(mixmusic)
 	Mix_Music *mixmusic
 	CODE:
 		Mix_FreeMusic(mixmusic);
+
+#endif
diff --git a/t/mixer.t b/t/mixer.t
@@ -1,8 +1,19 @@
 #!/usr/bin/perl -w
 use strict;
 use SDL;
+use SDL::Config;
 use Test::More;
 
+use lib 't/lib';
+use SDL::TestTool;
+
+if ( !SDL::TestTool->init(SDL_INIT_AUDIO) ) {
+    plan( skip_all => 'Failed to init sound' );
+}
+elsif( !SDL::Config->has('SDL_mixer') )
+{
+    plan( skip_all => 'SDL_mixer support not compiled' );
+}
 my @done = qw//;
 
 my @left = qw/

diff --git a/t/mixer_mixchunk.t b/t/mixer_mixchunk.t
@@ -1,19 +1,28 @@
 #!perl
 use strict;
 use warnings;
-use lib 't/lib';
 use SDL;
+use SDL::Config;
 use SDL::Mixer::MixChunk;
-use SDL::TestTool;
 use Test::More;
-use IO::CaptureOutput qw(capture);
+
+use lib 't/lib';
+
+use SDL::TestTool;
 
 if (! SDL::TestTool->init(SDL_INIT_AUDIO) ) {
     plan( skip_all => 'Failed to init sound' );
-} else {
+}
+elsif( !SDL::Config->has('SDL_mixer') )
+{
+    plan( skip_all => 'SDL_mixer support not compiled' );
+}
+else
+{
     plan( tests => 6 );
 }
 
+
 is( SDL::MixOpenAudio( 44100, SDL::Constants::AUDIO_S16, 2, 4096 ),
     0, 'MixOpenAudio passed' );
 

diff --git a/t/mixer_mixmusic.t b/t/mixer_mixmusic.t
@@ -1,16 +1,24 @@
 #!perl
 use strict;
 use warnings;
-use lib 't/lib';
 use SDL;
+use SDL::Config;
 use SDL::Mixer::MixMusic;
-use SDL::TestTool;
 use Test::More;
-use IO::CaptureOutput qw(capture);
+
+use lib 't/lib';
+
+use SDL::TestTool;
 
 if (! SDL::TestTool->init(SDL_INIT_AUDIO) ) {
     plan( skip_all => 'Failed to init sound' );
-} else {
+}
+elsif( !SDL::Config->has('SDL_mixer') )
+{
+    plan( skip_all => 'SDL_mixer support not compiled' );
+}
+else
+{
     plan( tests => 3 );
 }
 

diff --git a/t/mixerpm.t b/t/mixerpm.t
@@ -8,13 +8,20 @@ use SDL::TestTool;
 
 if ( !SDL::TestTool->init(SDL_INIT_AUDIO) ) {
     plan( skip_all => 'Failed to init sound' );
-} else {
+}
+elsif( !SDL::Config->has('SDL_mixer') )
+{
+    plan( skip_all => 'SDL_mixer support not compiled' );
+}
+else
+{
     plan( tests => 3 );
 }
 
 
 
 
+
 use_ok( 'SDL::Mixer' ); 
 
 can_ok ('SDL::Mixer', qw/