From 21445b67bba1c514c2246947b6732d67b0ccd566 Mon Sep 17 00:00:00 2001
From: Joel de Vahl <joel@stalverk80.se>
Date: Tue, 21 Oct 2008 16:16:16 +0000
Subject: use system installed sdl on osx

---
 default.bam             | 13 ++++++++++---
 scripts/make_release.py |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/default.bam b/default.bam
index 346a6102..b51040a2 100644
--- a/default.bam
+++ b/default.bam
@@ -29,6 +29,9 @@ function OptFindSDL(name, required)
 			option.use_sdlconfig = 1
 		end
 		
+		if platform == "macosx" then
+			option.value = 1
+		end
 	end
 	
 	local apply = function(option, settings)
@@ -36,7 +39,12 @@ function OptFindSDL(name, required)
 			settings.cc.flags = settings.cc.flags .. " -I/usr/include/SDL "
 			settings.linker.flags = settings.linker.flags .. " `sdl-config --libs` "
 		else
-			-- do something else here
+			if platform == "macosx" then
+				client_settings.linker.frameworks:add("SDL")
+				client_settings.cc.includes:add("/Library/Frameworks/SDL.framework/Headers")
+			else
+				-- do something else
+			end
 		end
 	end
 	
@@ -355,8 +363,7 @@ function build(settings)
 
 			if use_sdl then
 				client_settings.linker.frameworks:add("SDL")
-				client_settings.cc.includes:add("SDL.framework/Headers")
-				client_settings.linker.frameworkpath:add(".")
+				client_settings.cc.includes:add("/Library/Frameworks/SDL.framework/Headers")
 			end
 		else
 			if config.alsa.value == 1 then
diff --git a/scripts/make_release.py b/scripts/make_release.py
index 99e6d357..e5501a1b 100644
--- a/scripts/make_release.py
+++ b/scripts/make_release.py
@@ -92,7 +92,8 @@ if use_bundle:
 	shutil.copy("other/icons/Teeworlds.icns", bundle_resource_dir)
 	shutil.copy(name+exe_ext, bundle_bin_dir)
 	shutil.copy(name+"_srv"+exe_ext, bundle_bin_dir)
-	#copydir("SDL.framework", bundle_framework_dir)
+	print(bundle_framework_dir)
+	os.system("cp -R /Library/Frameworks/SDL.framework " + bundle_framework_dir)
 	file(os.path.join(bundle_content_dir, "Info.plist"), "w").write("""
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-- 
cgit 1.4.1