From 7ba51bdf36c822f2545516e7bff7ac17e9dbc29f Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Sun, 24 May 2015 22:06:48 -0500
Subject: [PATCH] Fix for bug #936 (Xcode 5.x+ project)

---
 .../project.pbxproj                           | 56 ++++++-------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj b/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj
index c7cafe7f3..19235f70b 100644
--- a/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj
+++ b/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj
@@ -8398,6 +8398,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-script-pipe";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Debug Static";
@@ -8430,6 +8431,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-script-pipe";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Release Static";
@@ -8766,6 +8768,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-script-pipe";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Debug Shared";
@@ -9104,6 +9107,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-script-pipe";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Release Shared";
@@ -9673,16 +9677,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9692,6 +9688,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Debug Static";
@@ -9711,16 +9708,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9730,6 +9719,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Debug Shared";
@@ -9749,16 +9739,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9768,6 +9750,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Release Static";
@@ -9787,16 +9770,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9806,6 +9781,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/** $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Release Shared";