From 8670ddf6357128094adf64ef165d730302006a5c Mon Sep 17 00:00:00 2001
From: Chris Moeller <kode54@gmail.com>
Date: Thu, 12 May 2016 22:37:28 -0700
Subject: [PATCH] Fixed Ogg Vorbis related crash

---
 .../macosx/Vorbis.xcodeproj/project.pbxproj   | 10 ++-----
 .../Vorbis/Vorbis.xcodeproj/project.pbxproj   | 27 ++-----------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj
index 6f3ada267..868755ca0 100644
--- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj
+++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj
@@ -750,10 +750,7 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				HEADER_SEARCH_PATHS = (
-					../lib,
-					../../../Frameworks/Ogg/include,
-				);
+				HEADER_SEARCH_PATHS = ../lib;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "";
@@ -784,10 +781,7 @@
 				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
 				FRAMEWORK_VERSION = A;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				HEADER_SEARCH_PATHS = (
-					../lib,
-					../../../Frameworks/Ogg/include,
-				);
+				HEADER_SEARCH_PATHS = ../lib;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "";
diff --git a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj
index 576bb146b..147d27c03 100644
--- a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj
+++ b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj
@@ -305,29 +305,17 @@
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Vorbis_Prefix.pch;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					../../Frameworks/Ogg/include,
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
-				OTHER_LDFLAGS = (
-					"-weak_framework",
-					Vorbis,
-					"-weak_framework",
-					ogg,
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cogx.vorbis;
 				PRODUCT_NAME = Vorbis;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				WRAPPER_EXTENSION = bundle;
-				ZERO_LINK = YES;
 			};
 			name = Debug;
 		};
@@ -342,22 +330,11 @@
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
 				);
-				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Vorbis_Prefix.pch;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					../../Frameworks/Ogg/include,
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
-				OTHER_LDFLAGS = (
-					"-weak_framework",
-					Vorbis,
-					"-weak_framework",
-					ogg,
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cogx.vorbis;
 				PRODUCT_NAME = Vorbis;
 				SDKROOT = macosx;