From 8838b65b309f7a8fe460b5114aec5a3e09739f9e Mon Sep 17 00:00:00 2001
From: Chris Moeller <kode54@gmail.com>
Date: Sat, 5 Oct 2013 02:35:27 -0700
Subject: [PATCH] Fixed nesting of Ogg framework

---
 Frameworks/Ogg/ogg.xcodeproj/project.pbxproj       | 4 ++--
 Frameworks/Opus/Opus.xcodeproj/project.pbxproj     | 9 +++++++++
 Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Frameworks/Ogg/ogg.xcodeproj/project.pbxproj b/Frameworks/Ogg/ogg.xcodeproj/project.pbxproj
index 4b99f3740..de6893ba0 100644
--- a/Frameworks/Ogg/ogg.xcodeproj/project.pbxproj
+++ b/Frameworks/Ogg/ogg.xcodeproj/project.pbxproj
@@ -225,7 +225,7 @@
 				GCC_PREFIX_HEADER = ogg_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "@loader_path/../Frameworks";
+				INSTALL_PATH = "@loader_path/Frameworks";
 				PRODUCT_NAME = ogg;
 				SKIP_INSTALL = YES;
 				USER_HEADER_SEARCH_PATHS = "libogg-src/include";
@@ -247,7 +247,7 @@
 				GCC_PREFIX_HEADER = ogg_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "@loader_path/../Frameworks";
+				INSTALL_PATH = "@loader_path/Frameworks";
 				PRODUCT_NAME = ogg;
 				SKIP_INSTALL = YES;
 				USER_HEADER_SEARCH_PATHS = "libogg-src/include";
diff --git a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj
index 5a86fb813..d750eed50 100644
--- a/Frameworks/Opus/Opus.xcodeproj/project.pbxproj
+++ b/Frameworks/Opus/Opus.xcodeproj/project.pbxproj
@@ -1171,6 +1171,10 @@
 				);
 				INFOPLIST_FILE = "Opus/Opus-Info.plist";
 				INSTALL_PATH = "@loader_path/../Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Ogg,
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				WRAPPER_EXTENSION = framework;
@@ -1194,6 +1198,10 @@
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
 				INFOPLIST_FILE = "Opus/Opus-Info.plist";
 				INSTALL_PATH = "@loader_path/../Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Ogg,
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				WRAPPER_EXTENSION = framework;
@@ -1219,6 +1227,7 @@
 				8375B08C17FFEABB0092A79F /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj b/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj
index 4257f3d94..55a6a0536 100644
--- a/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj
+++ b/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj
@@ -493,7 +493,7 @@
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				OTHER_CFLAGS = "-D__MACOSX__";
 				OTHER_LDFLAGS = (
-					"-sub_umbrella",
+					"-weak_framework",
 					Ogg,
 				);
 				PRODUCT_NAME = Vorbis;
@@ -527,7 +527,7 @@
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				OTHER_CFLAGS = "-D__MACOSX__";
 				OTHER_LDFLAGS = (
-					"-sub_umbrella",
+					"-weak_framework",
 					Ogg,
 				);
 				PRODUCT_NAME = Vorbis;