contribs: added SDL, SDL_image, Freetype, libpng

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

8 files changed, 417 insertions, 76 deletions

diff --git a/.gitmodules b/.gitmodules
index 42d67fdc22..cde4b47733 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,15 @@
 [submodule "crawl-ref/source/contrib/pcre"]
 	path = crawl-ref/source/contrib/pcre
 	url = git://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/pcre
+[submodule "crawl-ref/source/contrib/freetype"]
+	path = crawl-ref/source/contrib/freetype
+	url = git://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/freetype
+[submodule "crawl-ref/source/contrib/sdl"]
+	path = crawl-ref/source/contrib/sdl
+	url = git://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/sdl
+[submodule "crawl-ref/source/contrib/sdl-image"]
+	path = crawl-ref/source/contrib/sdl-image
+	url = git://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/sdl-image
+[submodule "crawl-ref/source/contrib/libpng"]
+	path = crawl-ref/source/contrib/libpng
+	url = git://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/libpng
diff --git a/crawl-ref/.gitignore b/crawl-ref/.gitignore
index bb47af26ed..0f77e83e1d 100644
--- a/crawl-ref/.gitignore
+++ b/crawl-ref/.gitignore
@@ -1,6 +1,7 @@
 *.[oa]
 *.ann
 *.diff
+*.DS_Store
 saves
 morgue
 *.orig
diff --git a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
index 987888ed30..a5f4b39d0c 100644
--- a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
+++ b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
@@ -241,11 +241,7 @@
 		B032D686106C02070002D70D /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B0EFD420BD12E9200002671 /* liblua.a */; };
 		B032D687106C02070002D70D /* libreadline.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B3B07560BD13A8100F2980E /* libreadline.dylib */; };
 		B032D688106C02070002D70D /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B3B075F0BD13AF000F2980E /* libncurses.dylib */; };
-		B032D689106C02070002D70D /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF201066ED0E0020B21F /* libpng.framework */; };
-		B032D68A106C02070002D70D /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF221066ED0E0020B21F /* SDL_image.framework */; };
-		B032D68B106C02070002D70D /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF241066ED0E0020B21F /* SDL.framework */; };
 		B032D68C106C02070002D70D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DFC91066F9A80020B21F /* OpenGL.framework */; };
-		B032D68D106C02070002D70D /* Freetype2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5E17B106706E40020B21F /* Freetype2.framework */; };
 		B032D68E106C02070002D70D /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B02C57901067129A006AC96D /* AppKit.framework */; };
 		B032D68F106C02150002D70D /* levcomp.ypp in Sources */ = {isa = PBXBuildFile; fileRef = 7B352ED20B001B9E00CABB32 /* levcomp.ypp */; };
 		B032D690106C02150002D70D /* levcomp.lpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B352ED10B001B9E00CABB32 /* levcomp.lpp */; };
@@ -362,10 +358,6 @@
 		B032D701106C02930002D70D /* gui.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2EF10671F8900AE855D /* gui.png */; };
 		B032D702106C02930002D70D /* main.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2F010671F8900AE855D /* main.png */; };
 		B032D703106C02930002D70D /* player.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2F110671F8900AE855D /* player.png */; };
-		B032D704106C029D0002D70D /* libpng.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF201066ED0E0020B21F /* libpng.framework */; };
-		B032D705106C029D0002D70D /* SDL_image.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF221066ED0E0020B21F /* SDL_image.framework */; };
-		B032D706106C029D0002D70D /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF241066ED0E0020B21F /* SDL.framework */; };
-		B032D707106C029D0002D70D /* Freetype2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5E17B106706E40020B21F /* Freetype2.framework */; };
 		B06FC50E1081D287008347BD /* bitary.cc in Sources */ = {isa = PBXBuildFile; fileRef = B06FC50C1081D287008347BD /* bitary.cc */; };
 		B07818DE1075D979008C3B64 /* sqldbm.cc in Sources */ = {isa = PBXBuildFile; fileRef = B07818DC1075D979008C3B64 /* sqldbm.cc */; };
 		B07818DF1075D979008C3B64 /* sqldbm.cc in Sources */ = {isa = PBXBuildFile; fileRef = B07818DC1075D979008C3B64 /* sqldbm.cc */; };
@@ -378,11 +370,16 @@
 		B09CCE3110830F1A00623CFA /* Crawl-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B09CCE3010830F1A00623CFA /* Crawl-Info.plist */; };
 		B09CCE671083159100623CFA /* settings in Resources */ = {isa = PBXBuildFile; fileRef = B09CCE5A1083159100623CFA /* settings */; };
 		B09CCE6C108315B300623CFA /* settings in Resources */ = {isa = PBXBuildFile; fileRef = B09CCE5A1083159100623CFA /* settings */; };
-		B0B5DF6A1066EE1A0020B21F /* libpng.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF201066ED0E0020B21F /* libpng.framework */; };
-		B0B5DF6B1066EE1A0020B21F /* SDL_image.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF221066ED0E0020B21F /* SDL_image.framework */; };
-		B0B5DF6C1066EE1A0020B21F /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF241066ED0E0020B21F /* SDL.framework */; };
-		B0B5E1DC106706FD0020B21F /* Freetype2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5E17B106706E40020B21F /* Freetype2.framework */; };
 		B0CFB315106DF67F005F9CC3 /* ctest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0CFB313106DF67F005F9CC3 /* ctest.cc */; };
+		B0F7DEF81086EDFE008FFA70 /* Freetype2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DEF51086EDE5008FFA70 /* Freetype2.framework */; };
+		B0F7DF181086EEBC008FFA70 /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DF091086EE7A008FFA70 /* SDL.framework */; };
+		B0F7DF191086EEC6008FFA70 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DF091086EE7A008FFA70 /* SDL.framework */; };
+		B0F7DF1A1086EEC6008FFA70 /* Freetype2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DEF51086EDE5008FFA70 /* Freetype2.framework */; };
+		B0F7DF8B1086F0D5008FFA70 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DF861086F0CB008FFA70 /* SDL_image.framework */; };
+		B0F7DF8C1086F0DB008FFA70 /* SDL_image.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DF861086F0CB008FFA70 /* SDL_image.framework */; };
+		B0F7DFEF1086F4F1008FFA70 /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DFEE1086F4EA008FFA70 /* libpng.framework */; };
+		B0F7DFF01086F4F6008FFA70 /* libpng.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0F7DFEE1086F4EA008FFA70 /* libpng.framework */; };
+		B0F7E17910876503008FFA70 /* l_los.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0F7E17710876503008FFA70 /* l_los.cc */; };
 		D274AC550FE66EEC00C9C1AE /* crash-u.cc in Sources */ = {isa = PBXBuildFile; fileRef = D274AC530FE66EEC00C9C1AE /* crash-u.cc */; };
 		D274AC5A0FE66EFC00C9C1AE /* spl-mis.cc in Sources */ = {isa = PBXBuildFile; fileRef = D274AC580FE66EFC00C9C1AE /* spl-mis.cc */; };
 		D2A696BD0DA29D4E00FDDE82 /* Crawl.icns in Resources */ = {isa = PBXBuildFile; fileRef = D2A696BC0DA29D4E00FDDE82 /* Crawl.icns */; };
@@ -438,6 +435,125 @@
 			remoteGlobalIDString = B082656E10731A95006EEC5A;
 			remoteInfo = SQLite;
 		};
+		B0F7DEF21086EDE5008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEEA1086EDE4008FFA70 /* Freetype2.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D2AAC046055464E500DB518D;
+			remoteInfo = "Static Library";
+		};
+		B0F7DEF41086EDE5008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEEA1086EDE4008FFA70 /* Freetype2.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B0B5E10F106701A60020B21F;
+			remoteInfo = Framework;
+		};
+		B0F7DEF61086EDF2008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEEA1086EDE4008FFA70 /* Freetype2.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = B0B5E10E106701A60020B21F;
+			remoteInfo = Framework;
+		};
+		B0F7DF081086EE7A008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BECDF66C0761BA81005FE872;
+			remoteInfo = Framework;
+		};
+		B0F7DF0A1086EE7A008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BECDF6B30761BA81005FE872;
+			remoteInfo = "Static Library";
+		};
+		B0F7DF0C1086EE7A008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BECDF6BA0761BA81005FE872;
+			remoteInfo = "Main Library";
+		};
+		B0F7DF0E1086EE7A008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BECDF6BE0761BA81005FE872;
+			remoteInfo = "Standard DMG";
+		};
+		B0F7DF101086EE7A008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BECDF6C30761BA81005FE872;
+			remoteInfo = "Developer Extras Package";
+		};
+		B0F7DF121086EE7A008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 0014B9A809C0E585003A99D5;
+			remoteInfo = "Framework Without X11 Stuff (for those who didn't install the X11 headers with Xcode)";
+		};
+		B0F7DF141086EE7A008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 002F327609CA02D800EBEB88;
+			remoteInfo = "Static Library Without X11 Stuff (for those who didn't install the X11 headers with Xcode)";
+		};
+		B0F7DF161086EEB0008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = BECDF5FE0761BA81005FE872;
+			remoteInfo = Framework;
+		};
+		B0F7DF851086F0CB008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DF7B1086F0CB008FFA70 /* SDL_image.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BE1FA72E07AF4C45004B6283;
+			remoteInfo = Framework;
+		};
+		B0F7DF871086F0CB008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DF7B1086F0CB008FFA70 /* SDL_image.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BE1FA74107AF4C45004B6283;
+			remoteInfo = "Static Library";
+		};
+		B0F7DF891086F0CB008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DF7B1086F0CB008FFA70 /* SDL_image.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = BE1FA74507AF4C45004B6283;
+			remoteInfo = "Create DMG";
+		};
+		B0F7DF9C1086F107008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DF7B1086F0CB008FFA70 /* SDL_image.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = BE1FA71807AF4C44004B6283;
+			remoteInfo = Framework;
+		};
+		B0F7DFED1086F4EA008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DFE61086F4EA008FFA70 /* libpng.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8D07F2C80486CC7A007CD1D0;
+			remoteInfo = libpng;
+		};
+		B0F7E170108764C7008FFA70 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B0F7DFE61086F4EA008FFA70 /* libpng.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0;
+			remoteInfo = libpng;
+		};
 		D2F272360DA1C5BC00445FE9 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -561,10 +677,10 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B032D704106C029D0002D70D /* libpng.framework in Copy Frameworks */,
-				B032D705106C029D0002D70D /* SDL_image.framework in Copy Frameworks */,
-				B032D706106C029D0002D70D /* SDL.framework in Copy Frameworks */,
-				B032D707106C029D0002D70D /* Freetype2.framework in Copy Frameworks */,
+				B0F7DFF01086F4F6008FFA70 /* libpng.framework in Copy Frameworks */,
+				B0F7DF181086EEBC008FFA70 /* SDL.framework in Copy Frameworks */,
+				B0F7DF8C1086F0DB008FFA70 /* SDL_image.framework in Copy Frameworks */,
+				B0F7DEF81086EDFE008FFA70 /* Freetype2.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -589,10 +705,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B0B5DF6A1066EE1A0020B21F /* libpng.framework in Copy Frameworks */,
-				B0B5DF6B1066EE1A0020B21F /* SDL_image.framework in Copy Frameworks */,
-				B0B5DF6C1066EE1A0020B21F /* SDL.framework in Copy Frameworks */,
-				B0B5E1DC106706FD0020B21F /* Freetype2.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -878,9 +990,6 @@
 		B090C2F110671F8900AE855D /* player.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = player.png; path = rltiles/player.png; sourceTree = "<group>"; };
 		B09CCE3010830F1A00623CFA /* Crawl-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Crawl-Info.plist"; path = "mac/Crawl-Info.plist"; sourceTree = "<group>"; };
 		B09CCE5A1083159100623CFA /* settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = settings; path = ../settings; sourceTree = SOURCE_ROOT; };
-		B0B5DF201066ED0E0020B21F /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/libpng.framework; sourceTree = "<absolute>"; };
-		B0B5DF221066ED0E0020B21F /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = "<absolute>"; };
-		B0B5DF241066ED0E0020B21F /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = "<absolute>"; };
 		B0B5DFC91066F9A80020B21F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		B0B5DFD21066FA240020B21F /* tiledef_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiledef_defines.h; path = rltiles/tiledef_defines.h; sourceTree = "<group>"; };
 		B0B5DFD31066FA240020B21F /* tiledef-dngn.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tiledef-dngn.cc"; path = "rltiles/tiledef-dngn.cc"; sourceTree = "<group>"; };
@@ -893,9 +1002,14 @@
 		B0B5DFDA1066FA240020B21F /* tiledef-player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tiledef-player.h"; path = "rltiles/tiledef-player.h"; sourceTree = "<group>"; };
 		B0B5DFDB1066FA240020B21F /* tiledef-unrand.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tiledef-unrand.cc"; path = "rltiles/tiledef-unrand.cc"; sourceTree = "<group>"; };
 		B0B5DFDC1066FA240020B21F /* tiledef-unrand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tiledef-unrand.h"; path = "rltiles/tiledef-unrand.h"; sourceTree = "<group>"; };
-		B0B5E17B106706E40020B21F /* Freetype2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Freetype2.framework; path = /Library/Frameworks/Freetype2.framework; sourceTree = "<absolute>"; };
 		B0CFB313106DF67F005F9CC3 /* ctest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ctest.cc; sourceTree = "<group>"; };
 		B0CFB314106DF67F005F9CC3 /* ctest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ctest.h; sourceTree = "<group>"; };
+		B0F7DEEA1086EDE4008FFA70 /* Freetype2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Freetype2.xcodeproj; path = contrib/freetype/builds/mac/Xcode/Freetype2.xcodeproj; sourceTree = "<group>"; };
+		B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = contrib/sdl/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
+		B0F7DF7B1086F0CB008FFA70 /* SDL_image.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_image.xcodeproj; path = "contrib/sdl-image/Xcode/SDL_image.xcodeproj"; sourceTree = "<group>"; };
+		B0F7DFE61086F4EA008FFA70 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = contrib/libpng/projects/xcode/libpng.xcodeproj; sourceTree = "<group>"; };
+		B0F7E17710876503008FFA70 /* l_los.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = l_los.cc; sourceTree = "<group>"; };
+		B0F7E17810876503008FFA70 /* l_los.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_los.h; sourceTree = "<group>"; };
 		D25C91860FF0368E00D9E8AD /* main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cc; path = rltiles/tool/main.cc; sourceTree = "<group>"; };
 		D25C91870FF0368E00D9E8AD /* tile.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile.cc; path = rltiles/tool/tile.cc; sourceTree = "<group>"; };
 		D25C91880FF0368E00D9E8AD /* tile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tile.h; path = rltiles/tool/tile.h; sourceTree = "<group>"; };
@@ -964,15 +1078,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B032D68E106C02070002D70D /* AppKit.framework in Frameworks */,
 				B032D686106C02070002D70D /* liblua.a in Frameworks */,
-				B032D687106C02070002D70D /* libreadline.dylib in Frameworks */,
 				B032D688106C02070002D70D /* libncurses.dylib in Frameworks */,
-				B032D689106C02070002D70D /* libpng.framework in Frameworks */,
-				B032D68A106C02070002D70D /* SDL_image.framework in Frameworks */,
-				B032D68B106C02070002D70D /* SDL.framework in Frameworks */,
+				B032D687106C02070002D70D /* libreadline.dylib in Frameworks */,
 				B032D68C106C02070002D70D /* OpenGL.framework in Frameworks */,
-				B032D68D106C02070002D70D /* Freetype2.framework in Frameworks */,
-				B032D68E106C02070002D70D /* AppKit.framework in Frameworks */,
+				B0F7DFEF1086F4F1008FFA70 /* libpng.framework in Frameworks */,
+				B0F7DF8B1086F0D5008FFA70 /* SDL_image.framework in Frameworks */,
+				B0F7DF191086EEC6008FFA70 /* SDL.framework in Frameworks */,
+				B0F7DF1A1086EEC6008FFA70 /* Freetype2.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -989,6 +1103,10 @@
 		08FB7794FE84155DC02AAC07 /* Crawl */ = {
 			isa = PBXGroup;
 			children = (
+				B0F7DFE61086F4EA008FFA70 /* libpng.xcodeproj */,
+				B0F7DF7B1086F0CB008FFA70 /* SDL_image.xcodeproj */,
+				B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */,
+				B0F7DEEA1086EDE4008FFA70 /* Freetype2.xcodeproj */,
 				C6A0FF2B0290797F04C91782 /* Documentation */,
 				D25C91990FF037A000D9E8AD /* Frameworks */,
 				7B3B07610BD13B1700F2980E /* Libraries */,
@@ -1182,6 +1300,8 @@
 				7B237DF80A8EC9D000580F30 /* items.h */,
 				7B237E4F0A8EC9D000580F30 /* kills.cc */,
 				7B237E4E0A8EC9D000580F30 /* kills.h */,
+				B0F7E17710876503008FFA70 /* l_los.cc */,
+				B0F7E17810876503008FFA70 /* l_los.h */,
 				7B237DF70A8EC9D000580F30 /* lev-pand.cc */,
 				7B237DF60A8EC9D000580F30 /* lev-pand.h */,
 				7B237E640A8EC9D000580F30 /* libunix.cc */,
@@ -1348,6 +1468,47 @@
 			name = SQLite;
 			sourceTree = "<group>";
 		};
+		B0F7DEEB1086EDE4008FFA70 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B0F7DEF51086EDE5008FFA70 /* Freetype2.framework */,
+				B0F7DEF31086EDE5008FFA70 /* libFreetype2.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		B0F7DEFA1086EE79008FFA70 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B0F7DF091086EE7A008FFA70 /* SDL.framework */,
+				B0F7DF0B1086EE7A008FFA70 /* libSDL.a */,
+				B0F7DF0D1086EE7A008FFA70 /* libSDLmain.a */,
+				B0F7DF0F1086EE7A008FFA70 /* Standard DMG */,
+				B0F7DF111086EE7A008FFA70 /* Developer Extras Package */,
+				B0F7DF131086EE7A008FFA70 /* SDL.framework */,
+				B0F7DF151086EE7A008FFA70 /* libSDL.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		B0F7DF7C1086F0CB008FFA70 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B0F7DF861086F0CB008FFA70 /* SDL_image.framework */,
+				B0F7DF881086F0CB008FFA70 /* libSDL_image.a */,
+				B0F7DF8A1086F0CB008FFA70 /* Create DMG */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		B0F7DFE71086F4EA008FFA70 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B0F7DFEE1086F4EA008FFA70 /* libpng.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		C6A0FF2B0290797F04C91782 /* Documentation */ = {
 			isa = PBXGroup;
 			children = (
@@ -1423,11 +1584,7 @@
 		D25C91990FF037A000D9E8AD /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				B0B5DF201066ED0E0020B21F /* libpng.framework */,
-				B0B5DF221066ED0E0020B21F /* SDL_image.framework */,
-				B0B5DF241066ED0E0020B21F /* SDL.framework */,
 				B0B5DFC91066F9A80020B21F /* OpenGL.framework */,
-				B0B5E17B106706E40020B21F /* Freetype2.framework */,
 				B02C57901067129A006AC96D /* AppKit.framework */,
 			);
 			name = Frameworks;
@@ -1532,6 +1689,10 @@
 			dependencies = (
 				B032D530106C01DB0002D70D /* PBXTargetDependency */,
 				B082658610731C1C006EEC5A /* PBXTargetDependency */,
+				B0F7DEF71086EDF2008FFA70 /* PBXTargetDependency */,
+				B0F7DF171086EEB0008FFA70 /* PBXTargetDependency */,
+				B0F7DF9D1086F107008FFA70 /* PBXTargetDependency */,
+				B0F7E171108764C7008FFA70 /* PBXTargetDependency */,
 			);
 			name = "Crawl Tiles";
 			productName = "Crawl Tiles";
@@ -1585,6 +1746,24 @@
 			hasScannedForEncodings = 1;
 			mainGroup = 08FB7794FE84155DC02AAC07 /* Crawl */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = B0F7DEEB1086EDE4008FFA70 /* Products */;
+					ProjectRef = B0F7DEEA1086EDE4008FFA70 /* Freetype2.xcodeproj */;
+				},
+				{
+					ProductGroup = B0F7DFE71086F4EA008FFA70 /* Products */;
+					ProjectRef = B0F7DFE61086F4EA008FFA70 /* libpng.xcodeproj */;
+				},
+				{
+					ProductGroup = B0F7DEFA1086EE79008FFA70 /* Products */;
+					ProjectRef = B0F7DEF91086EE79008FFA70 /* SDL.xcodeproj */;
+				},
+				{
+					ProductGroup = B0F7DF7C1086F0CB008FFA70 /* Products */;
+					ProjectRef = B0F7DF7B1086F0CB008FFA70 /* SDL_image.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				B032D526106C01AF0002D70D /* Crawl Tiles */,
@@ -1596,6 +1775,100 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		B0F7DEF31086EDE5008FFA70 /* libFreetype2.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libFreetype2.a;
+			remoteRef = B0F7DEF21086EDE5008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DEF51086EDE5008FFA70 /* Freetype2.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Freetype2.framework;
+			remoteRef = B0F7DEF41086EDE5008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF091086EE7A008FFA70 /* SDL.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SDL.framework;
+			remoteRef = B0F7DF081086EE7A008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF0B1086EE7A008FFA70 /* libSDL.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libSDL.a;
+			remoteRef = B0F7DF0A1086EE7A008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF0D1086EE7A008FFA70 /* libSDLmain.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libSDLmain.a;
+			remoteRef = B0F7DF0C1086EE7A008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF0F1086EE7A008FFA70 /* Standard DMG */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = "Standard DMG";
+			remoteRef = B0F7DF0E1086EE7A008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF111086EE7A008FFA70 /* Developer Extras Package */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = "Developer Extras Package";
+			remoteRef = B0F7DF101086EE7A008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF131086EE7A008FFA70 /* SDL.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SDL.framework;
+			remoteRef = B0F7DF121086EE7A008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF151086EE7A008FFA70 /* libSDL.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libSDL.a;
+			remoteRef = B0F7DF141086EE7A008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF861086F0CB008FFA70 /* SDL_image.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SDL_image.framework;
+			remoteRef = B0F7DF851086F0CB008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF881086F0CB008FFA70 /* libSDL_image.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libSDL_image.a;
+			remoteRef = B0F7DF871086F0CB008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DF8A1086F0CB008FFA70 /* Create DMG */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = "Create DMG";
+			remoteRef = B0F7DF891086F0CB008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B0F7DFEE1086F4EA008FFA70 /* libpng.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = libpng.framework;
+			remoteRef = B0F7DFED1086F4EA008FFA70 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		B032D523106C01AF0002D70D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -1919,6 +2192,7 @@
 				B032D6F0106C02150002D70D /* version.cc in Sources */,
 				B032D6AD106C02150002D70D /* view.cc in Sources */,
 				B032D6E4106C02150002D70D /* xom.cc in Sources */,
+				B0F7E17910876503008FFA70 /* l_los.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1958,6 +2232,26 @@
 			target = B082656E10731A95006EEC5A /* SQLite */;
 			targetProxy = B082658710731C22006EEC5A /* PBXContainerItemProxy */;
 		};
+		B0F7DEF71086EDF2008FFA70 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Framework;
+			targetProxy = B0F7DEF61086EDF2008FFA70 /* PBXContainerItemProxy */;
+		};
+		B0F7DF171086EEB0008FFA70 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Framework;
+			targetProxy = B0F7DF161086EEB0008FFA70 /* PBXContainerItemProxy */;
+		};
+		B0F7DF9D1086F107008FFA70 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Framework;
+			targetProxy = B0F7DF9C1086F107008FFA70 /* PBXContainerItemProxy */;
+		};
+		B0F7E171108764C7008FFA70 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libpng;
+			targetProxy = B0F7E170108764C7008FFA70 /* PBXContainerItemProxy */;
+		};
 		D2F272370DA1C5BC00445FE9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 7B0EFD410BD12E9200002671 /* Lua */;
@@ -1966,7 +2260,7 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		1DEB928608733DD80010E9CD /* Development */ = {
+		1DEB928608733DD80010E9CD /* Profile */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
@@ -1989,9 +2283,9 @@
 				PRODUCT_NAME = crawl;
 				YACC_GENERATED_FILE_STEM = InputFileStem;
 			};
-			name = Development;
+			name = Profile;
 		};
-		1DEB928A08733DD80010E9CD /* Development */ = {
+		1DEB928A08733DD80010E9CD /* Profile */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
@@ -2034,9 +2328,9 @@
 				SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk;
 				WARNING_CFLAGS = "";
 			};
-			name = Development;
+			name = Profile;
 		};
-		7B0EFD470BD12EA700002671 /* Development */ = {
+		7B0EFD470BD12EA700002671 /* Profile */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -2048,7 +2342,7 @@
 				GCC_WARN_PEDANTIC = NO;
 				PRODUCT_NAME = lua;
 			};
-			name = Development;
+			name = Profile;
 		};
 		7B0EFD480BD12EA700002671 /* Release */ = {
 			isa = XCBuildConfiguration;
@@ -2256,8 +2550,8 @@
 		7B97C0270A8ED34400CE8936 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 2;
 				GCC_PREPROCESSOR_DEFINITIONS = OSX;
@@ -2294,10 +2588,14 @@
 			};
 			name = Release;
 		};
-		B032D52A106C01AF0002D70D /* Development */ = {
+		B032D52A106C01AF0002D70D /* Profile */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/contrib/Frameworks/Release",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug",
+				);
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
@@ -2311,10 +2609,14 @@
 				GCC_VERSION = 4.0;
 				GCC_WARN_UNINITIALIZED_AUTOS = NO;
 				HEADER_SEARCH_PATHS = (
-					/Library/Frameworks/Freetype2.framework/Headers,
-					/Library/Frameworks/SDL.framework/Headers,
-					/Library/Frameworks/SDL_image.framework/Headers,
-					/Library/Frameworks/libpng.framework/Headers,
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/libpng.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/libpng.framework/Headers",
 				);
 				INFOPLIST_FILE = "mac/Crawl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -2322,13 +2624,17 @@
 				PRODUCT_NAME = "Dungeon Crawl Stone Soup";
 				YACC_GENERATED_FILE_STEM = InputFileStem;
 			};
-			name = Development;
+			name = Profile;
 		};
 		B032D52B106C01AF0002D70D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/contrib/Frameworks/Release",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug",
+				);
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2341,10 +2647,14 @@
 				GCC_VERSION = 4.0;
 				GCC_WARN_UNINITIALIZED_AUTOS = NO;
 				HEADER_SEARCH_PATHS = (
-					/Library/Frameworks/Freetype2.framework/Headers,
-					/Library/Frameworks/SDL.framework/Headers,
-					/Library/Frameworks/SDL_image.framework/Headers,
-					/Library/Frameworks/libpng.framework/Headers,
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/libpng.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/libpng.framework/Headers",
 				);
 				INFOPLIST_FILE = "mac/Crawl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -2358,6 +2668,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/contrib/Frameworks/Release",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug",
+				);
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
@@ -2371,10 +2685,14 @@
 				GCC_VERSION = 4.0;
 				GCC_WARN_UNINITIALIZED_AUTOS = NO;
 				HEADER_SEARCH_PATHS = (
-					/Library/Frameworks/Freetype2.framework/Headers,
-					/Library/Frameworks/SDL.framework/Headers,
-					/Library/Frameworks/SDL_image.framework/Headers,
-					/Library/Frameworks/libpng.framework/Headers,
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/libpng.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/libpng.framework/Headers",
 				);
 				INFOPLIST_FILE = "mac/Crawl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -2387,6 +2705,10 @@
 		B032D52D106C01AF0002D70D /* Wizard */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/contrib/Frameworks/Release",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug",
+				);
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2399,10 +2721,14 @@
 				GCC_VERSION = 4.0;
 				GCC_WARN_UNINITIALIZED_AUTOS = NO;
 				HEADER_SEARCH_PATHS = (
-					/Library/Frameworks/Freetype2.framework/Headers,
-					/Library/Frameworks/SDL.framework/Headers,
-					/Library/Frameworks/SDL_image.framework/Headers,
-					/Library/Frameworks/libpng.framework/Headers,
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Release/libpng.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/Freetype2.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/SDL_image.framework/Headers",
+					"$(PROJECT_DIR)/contrib/Frameworks/Debug/libpng.framework/Headers",
 				);
 				INFOPLIST_FILE = "mac/Crawl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -2412,7 +2738,7 @@
 			};
 			name = Wizard;
 		};
-		B082657010731A95006EEC5A /* Development */ = {
+		B082657010731A95006EEC5A /* Profile */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -2450,7 +2776,7 @@
 				PRODUCT_NAME = SQLite;
 				WARNING_CFLAGS = "-w";
 			};
-			name = Development;
+			name = Profile;
 		};
 		B082657110731A95006EEC5A /* Release */ = {
 			isa = XCBuildConfiguration;
@@ -2571,7 +2897,7 @@
 			};
 			name = Wizard;
 		};
-		D2F271F90DA1C58C00445FE9 /* Development */ = {
+		D2F271F90DA1C58C00445FE9 /* Profile */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
@@ -2588,7 +2914,7 @@
 				PRODUCT_NAME = "Dungeon Crawl Stone Soup - ASCII";
 				WRAPPER_EXTENSION = app;
 			};
-			name = Development;
+			name = Profile;
 		};
 		D2F271FA0DA1C58C00445FE9 /* Release */ = {
 			isa = XCBuildConfiguration;
@@ -2653,68 +2979,68 @@
 		1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "Crawl-cmd" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				1DEB928608733DD80010E9CD /* Development */,
+				1DEB928608733DD80010E9CD /* Profile */,
 				7B97C0260A8ED34400CE8936 /* Release */,
 				7B97C01F0A8ECFD700CE8936 /* Debug */,
 				7B97C0240A8ED2AB00CE8936 /* Wizard */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Profile;
 		};
 		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Crawl" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				1DEB928A08733DD80010E9CD /* Development */,
+				1DEB928A08733DD80010E9CD /* Profile */,
 				7B97C0270A8ED34400CE8936 /* Release */,
 				7B97C0200A8ECFD700CE8936 /* Debug */,
 				7B97C0250A8ED2AB00CE8936 /* Wizard */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Profile;
 		};
 		7B0EFD460BD12EA700002671 /* Build configuration list for PBXNativeTarget "Lua" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				7B0EFD470BD12EA700002671 /* Development */,
+				7B0EFD470BD12EA700002671 /* Profile */,
 				7B0EFD480BD12EA700002671 /* Release */,
 				7B0EFD490BD12EA700002671 /* Debug */,
 				7B0EFD4A0BD12EA700002671 /* Wizard */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Profile;
 		};
 		B032D52E106C01AF0002D70D /* Build configuration list for PBXNativeTarget "Crawl Tiles" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				B032D52A106C01AF0002D70D /* Development */,
+				B032D52A106C01AF0002D70D /* Profile */,
 				B032D52B106C01AF0002D70D /* Release */,
 				B032D52C106C01AF0002D70D /* Debug */,
 				B032D52D106C01AF0002D70D /* Wizard */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Profile;
 		};
 		B082657510731AA1006EEC5A /* Build configuration list for PBXNativeTarget "SQLite" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				B082657010731A95006EEC5A /* Development */,
+				B082657010731A95006EEC5A /* Profile */,
 				B082657110731A95006EEC5A /* Release */,
 				B082657210731A95006EEC5A /* Debug */,
 				B082657310731A95006EEC5A /* Wizard */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Profile;
 		};
 		D2F271FD0DA1C58C00445FE9 /* Build configuration list for PBXNativeTarget "Crawl ASCII" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D2F271F90DA1C58C00445FE9 /* Development */,
+				D2F271F90DA1C58C00445FE9 /* Profile */,
 				D2F271FA0DA1C58C00445FE9 /* Release */,
 				D2F271FB0DA1C58C00445FE9 /* Debug */,
 				D2F271FC0DA1C58C00445FE9 /* Wizard */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Profile;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/crawl-ref/source/contrib/.gitignore b/crawl-ref/source/contrib/.gitignore
new file mode 100644
index 0000000000..849627de30
--- /dev/null
+++ b/crawl-ref/source/contrib/.gitignore
@@ -0,0 +1,2 @@
+# Xcode build outputs
+Frameworks
diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype
new file mode 160000
+Subproject dcd353e633d79b188b854316c1fbc7b722ad39c
diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng
new file mode 160000
+Subproject c970ebf5d332c3ac60870266955f74f1ede8383
diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl
new file mode 160000
+Subproject 2166d861a3287daa554b51477b549c4761d4699
diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image
new file mode 160000
+Subproject 6ecfa91b8fbfc0583c99a4338d600da373bfe6f