X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=make%2Flib%2FSDL%2FBuild%2FDarwin.pm;h=76f1252786eabe03905712010a8b242557ab9314;hb=a3c3bf6e7a022c349fd6ab1a1c86b9042de32fa3;hp=2dd22225d0fd4234a37d86defc60d8c7ade1e551;hpb=3a32e86d2417c9a8078fd75d3f15d11e6bcefecf;p=sdlgit%2FSDL_perl.git

diff --git a/make/lib/SDL/Build/Darwin.pm b/make/lib/SDL/Build/Darwin.pm
index 2dd2222..76f1252 100644
--- a/make/lib/SDL/Build/Darwin.pm
+++ b/make/lib/SDL/Build/Darwin.pm
@@ -34,29 +34,62 @@ use base 'SDL::Build';
 
 sub fetch_includes
 {
+	use Config;
+
+	my (@include_path, @lib_path);
+
+	{
+		my %seen;
+		foreach (
+			($Config{ccflags} =~ /-I(\S+)/g),
+			($Config{cppflags} =~ /-I(\S+)/g),
+		) {
+			foreach my $sdl_lib_dir ($_, "$_/SDL") {
+				next unless -f "$sdl_lib_dir/SDL.h";
+				push @include_path, $sdl_lib_dir unless $seen{$sdl_lib_dir}++;
+			}
+		}
+	}
+
+	{
+		my %seen;
+		foreach (
+			($Config{libpth} =~ /(\S+)/g),
+			($Config{libsdirs} =~ /(\S+)/g),
+			($Config{libspath} =~ /(\S+)/g),
+			($Config{lddlflags} =~ /-I(\S+)/g),
+			($Config{ldflags} =~ /-I(\S+)/g),
+		) {
+			next unless -f "$_/libSDL.a";
+			push @lib_path, $_ unless $seen{$_}++;
+		}
+	}
+
+	die "Can't find an SDL library" unless @include_path and @lib_path;
+	warn "Found SDL headers in $include_path[0] and library in $lib_path[0]";
+
 	return (
-	'/usr/local/include/SDL'   => '/usr/local/lib',
-	'/usr/local/include'       => '/usr/local/lib',
-	'/usr/local/include/smpeg' => '/usr/local/lib',
-	'/usr/include/SDL'         => '/usr/lib',
-	'/usr/include'             => '/usr/lib',
-	'/usr/include/smpeg'       => '/usr/lib',
-	'/usr/local/include/GL'    => '/usr/local/lib',
-	'/usr/local/include/gl'    => '/usr/local/lib',
-	'/usr/include/GL'          => '/usr/lib', 
-	'/usr/include/gl'          => '/usr/lib', 
-	'/opt/local/include/SDL'   => '/opt/local/lib',		# Mac Ports
-	'/opt/local/include'   => '/opt/local/lib',		# Mac Ports
-
-	'/System/Library/Frameworks/SDL_mixer.framework/Headers'     => '../../lib',
-	'/System/Library/Frameworks/SDL_image.framework/Headers'     => '../../lib',
-	'/System/Library/Frameworks/SDL_ttf.framework/Headers'       => '../../lib',
-	'/System/Library/Frameworks/libogg.framework/Headers'        => '../../lib',
-	'/System/Library/Frameworks/libvorbis.framework/Headers'     => '../../lib',
-	'/System/Library/Frameworks/libvorbisfile.framework/Headers' => '../../lib',
-	'/System/Library/Frameworks/libvorbisenc.framework/Headers'  => '../../lib',
-	'../../include'                                              => '../../lib',
-	'/System/Library/Frameworks/OpenGL.framework/Headers'        => '/System/Library/Frameworks/OpenGL.framework/Libraries',
+		$include_path[0] => $lib_path[0],
+
+		# Local libraries.
+		'/usr/local/include/smpeg' => '/usr/local/lib',
+		'/usr/local/include/GL'    => '/usr/local/lib',
+		'/usr/local/include/gl'    => '/usr/local/lib',
+
+		# System libraries.
+		'/usr/include/smpeg'       => '/usr/lib',
+		'/usr/include/GL'          => '/usr/lib', 
+		'/usr/include/gl'          => '/usr/lib', 
+
+		# System-wide frameworks.
+		'/System/Library/Frameworks/libogg.framework/Headers'        => '../../lib',
+		'/System/Library/Frameworks/libvorbis.framework/Headers'     => '../../lib',
+		'/System/Library/Frameworks/libvorbisfile.framework/Headers' => '../../lib',
+		'/System/Library/Frameworks/libvorbisenc.framework/Headers'  => '../../lib',
+		'/System/Library/Frameworks/OpenGL.framework/Headers'        => '/System/Library/Frameworks/OpenGL.framework/Libraries',
+
+		# System libraries.
+		'/System/Library/Frameworks/OpenGL.framework/Headers'        => '/System/Library/Frameworks/OpenGL.framework/Libraries',
 	);
 }