From f2cca861dd3e14bed7518ef674abdf4db4048588 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 26 Nov 2013 10:04:21 +0000 Subject: [PATCH] Introjucer: quoting of all include paths to keep Xcode 5 happy. --- .../Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj | 4 ++-- .../Source/Project Saving/jucer_ProjectExport_XCode.h | 2 +- .../Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj | 4 ++-- .../Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj | 4 ++-- .../Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj | 4 ++-- .../Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj | 4 ++-- .../Builds/iOS/HelloWorld.xcodeproj/project.pbxproj | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index 160fa9ff56..e8b751c6b1 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -1877,7 +1877,7 @@ 92ABB8016546F41128399E9D ); name = Source; sourceTree = ""; }; EA0BCC969703B2D179089E55 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter"; @@ -1897,7 +1897,7 @@ "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; B159CF4275B8A90122629FF4 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = 3; INFOPLIST_FILE = Info.plist; OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter"; diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h index 8e282fa6a9..c5f5ef45df 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -580,7 +580,7 @@ private: if (s.containsChar (' ')) s = "\"\\\"" + s + "\\\"\""; // crazy double quotes required when there are spaces.. - else if (s.containsAnyOf ("${}()@&~+-=<>\t;\r\n")) + else s = "\"" + s + "\""; } diff --git a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index 394e70176d..efe1d82472 100644 --- a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -2049,7 +2049,7 @@ 7EA0AEAFB626CDF5E0038ED5, 227AE5B2ACBB7881D9552404 ); name = Source; sourceTree = ""; }; 77D1D11FAA110A1B1F960A8F = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", ../../JuceLibraryCode, ../../../../modules, "$(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase", "$(inherited)"); + HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; @@ -2075,7 +2075,7 @@ "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 76082281008CF5F891C856DA = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", ../../JuceLibraryCode, ../../../../modules, "$(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase", "$(inherited)"); + HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; diff --git a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj index ac7aa3e511..75590501e4 100644 --- a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj +++ b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj @@ -2005,7 +2005,7 @@ D1C4804CD275CB57A5C89A2D, D85C0D11EE4F6C73B9EB5BCD ); name = Source; sourceTree = ""; }; 92E529F622AC4282800634D3 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "~/SDKs/vstsdk2.4", ../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; @@ -2025,7 +2025,7 @@ "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 20F59BC9E9ACBDF56007CE03 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "~/SDKs/vstsdk2.4", ../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; diff --git a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj index 2ef5786d70..48856657cb 100644 --- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj +++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj @@ -453,7 +453,7 @@ E28F51A0038F01E08E22F853, 70A875922C34E55D4F48A196 ); name = Source; sourceTree = ""; }; 3C712C667F851F9061100DD7 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "/usr/bin"; @@ -472,7 +472,7 @@ "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 145C0C90E41D8DECE4DD66AD = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "/usr/bin"; diff --git a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj index 21ec5e61e6..87f526ae9b 100644 --- a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj @@ -1432,7 +1432,7 @@ C581D34B32A781E9AED7F7B0, 1C83313FCFBC3FAFA8CDB087 ); name = Source; sourceTree = ""; }; 34AEE2803DA0D6192C299422 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; @@ -1451,7 +1451,7 @@ "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; diff --git a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj index d95b04b814..9ac986f0ab 100644 --- a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj @@ -1429,7 +1429,7 @@ C581D34B32A781E9AED7F7B0, 1C83313FCFBC3FAFA8CDB087 ); name = Source; sourceTree = ""; }; 34AEE2803DA0D6192C299422 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; @@ -1446,7 +1446,7 @@ "DEBUG=1", "JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; }; 339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = (../../JuceLibraryCode, ../../../../modules, "$(inherited)"); + HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications";