From 272c38ff531c81893fd8d020afddf1b2cd61ac92 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 13 Nov 2013 10:04:33 +0000 Subject: [PATCH] Introjucer: avoided mangling Xcode frameworks if they're specified as absolute paths. --- .../Source/Project Saving/jucer_ProjectExport_XCode.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h index 297a9bd708..98bb3346b3 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -1010,9 +1010,16 @@ private: void addFramework (const String& frameworkName) const { - const String path ("System/Library/Frameworks/" + frameworkName + ".framework"); + String path (frameworkName); + if (! File::isAbsolutePath (path)) + path = "System/Library/Frameworks/" + path; + + if (! path.endsWithIgnoreCase (".framework")) + path << ".framework"; + const String fileRefID (createFileRefID (path)); - addFileReference ("${SDKROOT}/" + path); + + addFileReference ((File::isAbsolutePath (frameworkName) ? "" : "${SDKROOT}/") + path); frameworkIDs.add (addBuildFile (path, fileRefID, false, false)); frameworkFileIDs.add (fileRefID); }