cfg, 3rdparty: update build to work in directories with spaces in them.

6 files changed, 11 insertions, 7 deletions

diff --git a/3rdparty/opensslbuild/Base.xcconfig b/3rdparty/opensslbuild/Base.xcconfig
index b06ed06..c4b1503 100644
--- a/3rdparty/opensslbuild/Base.xcconfig
+++ b/3rdparty/opensslbuild/Base.xcconfig
@@ -8,7 +8,7 @@ SDKROOT = iphoneos
 MACOSX_DEPLOYMENT_TARGET = 10.7
 IPHONEOS_DEPLOYMENT_TARGET = 5.0
 
-HEADER_SEARCH_PATHS = $(PROJECT_DIR)/../openssl $(PROJECT_DIR)/../openssl/include $(PROJECT_DIR)/../openssl/crypto $(PROJECT_DIR)/../openssl/crypto/asn1 $(PROJECT_DIR)/../openssl/crypto/evp
+HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../openssl" "$(PROJECT_DIR)/../openssl/include" "$(PROJECT_DIR)/../openssl/crypto" "$(PROJECT_DIR)/../openssl/crypto/asn1" "$(PROJECT_DIR)/../openssl/crypto/evp"
 ALWAYS_SEARCH_USER_PATHS = NO
 
 GCC_WARN_INHIBIT_ALL_WARNINGS = YES
diff --git a/3rdparty/opusbuild/Base.xcconfig b/3rdparty/opusbuild/Base.xcconfig
index fab985f..a1fb285 100644
--- a/3rdparty/opusbuild/Base.xcconfig
+++ b/3rdparty/opusbuild/Base.xcconfig
@@ -11,7 +11,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0
 //OTHER_LDFLAGS = -x c++
 OTHER_CFLAGS = -x c++
 
-HEADER_SEARCH_PATHS = . $(PROJECT_DIR)/../opus/silk/float $(PROJECT_DIR)/../opus/silk $(PROJECT_DIR)/../opus/include $(PROJECT_DIR)/../opus/celt
+HEADER_SEARCH_PATHS = . "$(PROJECT_DIR)/../opus/silk/float" "$(PROJECT_DIR)/../opus/silk" "$(PROJECT_DIR)/../opus/include" "$(PROJECT_DIR)/../opus/celt"
 ALWAYS_SEARCH_USER_PATHS = YES
 
 GCC_WARN_INHIBIT_ALL_WARNINGS = YES
diff --git a/3rdparty/protobufbuild/Base.xcconfig b/3rdparty/protobufbuild/Base.xcconfig
index 57bfa16..4f8ae89 100644
--- a/3rdparty/protobufbuild/Base.xcconfig
+++ b/3rdparty/protobufbuild/Base.xcconfig
@@ -8,13 +8,17 @@ SDKROOT = iphoneos
 MACOSX_DEPLOYMENT_TARGET = 10.7
 IPHONEOS_DEPLOYMENT_TARGET = 5.0
 
-HEADER_SEARCH_PATHS = $(PROJECT_DIR)/../protobuf/src/runtime/Classes
+HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../protobuf/src/runtime/Classes"
 ALWAYS_SEARCH_USER_PATHS = NO
 
 GCC_WARN_INHIBIT_ALL_WARNINGS = YES
 
 GCC_ENABLE_OBJC_EXCEPTIONS = YES
 GCC_PRECOMPILE_PREFIX_HEADER = YES
+
+# The precompiled header doesn't need to be quoted to work in
+# paths with spaces in them. It actually *breaks* if we put
+# them there. So don't.
 GCC_PREFIX_HEADER = $(PROJECT_DIR)/../protobuf/src/runtime/ProtocolBuffers_Prefix.pch
 
 GCC_PREPROCESSOR_DEFINITIONS = 
diff --git a/3rdparty/speexbuild/Base.xcconfig b/3rdparty/speexbuild/Base.xcconfig
index 830454a..1acdb81 100644
--- a/3rdparty/speexbuild/Base.xcconfig
+++ b/3rdparty/speexbuild/Base.xcconfig
@@ -8,7 +8,7 @@ SDKROOT = iphoneos
 MACOSX_DEPLOYMENT_TARGET = 10.7
 IPHONEOS_DEPLOYMENT_TARGET = 5.0
 
-HEADER_SEARCH_PATHS = . $(PROJECT_DIR)/../speex/include $(PROJECT_DIR)/../libspeex
+HEADER_SEARCH_PATHS = . "$(PROJECT_DIR)/../speex/include" "$(PROJECT_DIR)/../libspeex"
 ALWAYS_SEARCH_USER_PATHS = NO
 
 GCC_WARN_INHIBIT_ALL_WARNINGS = YES
diff --git a/3rdparty/speexdspbuild/Base.xcconfig b/3rdparty/speexdspbuild/Base.xcconfig
index c48707d..375064f 100644
--- a/3rdparty/speexdspbuild/Base.xcconfig
+++ b/3rdparty/speexdspbuild/Base.xcconfig
@@ -8,7 +8,7 @@ SDKROOT = iphoneos
 MACOSX_DEPLOYMENT_TARGET = 10.7
 IPHONEOS_DEPLOYMENT_TARGET = 5.0
 
-HEADER_SEARCH_PATHS = $(PROJECT_DIR) $(PROJECT_DIR)/../speex/libspeex $(PROJECT_DIR)/../speex/include
+HEADER_SEARCH_PATHS = "$(PROJECT_DIR)" "$(PROJECT_DIR)/../speex/libspeex" "$(PROJECT_DIR)/../speex/include"
 ALWAYS_SEARCH_USER_PATHS = NO
 
 GCC_WARN_INHIBIT_ALL_WARNINGS = YES
diff --git a/cfg/Base.xcconfig b/cfg/Base.xcconfig
index a1cac50..f76c9ea 100644
--- a/cfg/Base.xcconfig
+++ b/cfg/Base.xcconfig
@@ -8,8 +8,8 @@ SDKROOT = iphoneos
 MACOSX_DEPLOYMENT_TARGET = 10.7
 IPHONEOS_DEPLOYMENT_TARGET = 5.0
 
-HEADER_SEARCH_PATHS = src proto 3rdparty/speex/include 3rdparty/celt-0.7.0/libcelt 3rdparty/opus/include 3rdparty/openssl/include 3rdparty/protobuf/src/runtime/Classes
-LIBRARY_SEARCH_PATHS = $(inherited) "$(SRCROOT)"
+HEADER_SEARCH_PATHS = "$(SRCROOT)/src" "$(SRCROOT)/proto" "$(SRCROOT)/3rdparty/speex/include" "$(SRCROOT)/3rdparty/celt-0.7.0/libcelt" "$(SRCROOT)/3rdparty/opus/include" "$(SRCROOT)/3rdparty/openssl/include" "$(SRCROOT)/3rdparty/protobuf/src/runtime/Classes"
+LIBRARY_SEARCH_PATHS = "$(inherited)" "$(SRCROOT)"
 
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_PREFIX_HEADER = src/MumbleKit.pch