Xcode: Fix a bug in paths with a tilde

juce-framework · Feb 14, 2024 · e265be5 · e265be5
1 parent a8ae6ed
commit e265be5
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
@@ -2081,12 +2081,17 @@ class XcodeProjectExporter final : public ProjectExporter,
 
 private:
     //==============================================================================
+    static String replaceHomeTildeInPath (const String& path)
+    {
+        return path.startsWithChar ('~') ? "$(HOME)" + path.substring (1)
+                                         : path;
+    }
+
     static String expandPath (const String& path)
     {
         if (! build_tools::isAbsolutePath (path))  return "$(SRCROOT)/" + path;
-        if (path.startsWithChar ('~'))             return "$(HOME)" + path.substring (1);
 
-        return path;
+        return replaceHomeTildeInPath (path);
     }
 
     static String addQuotesIfRequired (const String& s)
@@ -2216,28 +2221,22 @@ class XcodeProjectExporter final : public ProjectExporter,
 
             target->addMainBuildProduct();
 
-            if (target->type == XcodeTarget::LV2Helper
-                && project.getEnabledModules().isModuleEnabled ("juce_audio_plugin_client"))
+            if (project.getEnabledModules().isModuleEnabled ("juce_audio_plugin_client"))
             {
-                const auto path = rebaseFromProjectFolderToBuildTarget (getLV2HelperProgramSource());
-                addFile (FileOptions().withRelativePath ({ path.toUnixStyle(), path.getRoot() })
-                                      .withSkipPCHEnabled (true)
-                                      .withCompilationEnabled (true)
-                                      .withInhibitWarningsEnabled (true)
-                                      .withCompilerFlags ("-std=c++11")
-                                      .withXcodeTarget (target));
-            }
-
-            if (target->type == XcodeTarget::VST3Helper
-                && project.getEnabledModules().isModuleEnabled ("juce_audio_plugin_client"))
-            {
-                const auto path = rebaseFromProjectFolderToBuildTarget (getVST3HelperProgramSource());
-                addFile (FileOptions().withRelativePath ({ path.toUnixStyle(), path.getRoot() })
-                                      .withSkipPCHEnabled (true)
-                                      .withCompilationEnabled (true)
-                                      .withInhibitWarningsEnabled (true)
-                                      .withCompilerFlags ("-std=c++17 -fobjc-arc")
-                                      .withXcodeTarget (target));
+                auto getFileOptions = [this, target] (const build_tools::RelativePath& path)
+                {
+                    const auto rebasedPath = rebaseFromProjectFolderToBuildTarget (path);
+                    return FileOptions().withRelativePath ({ replaceHomeTildeInPath (rebasedPath.toUnixStyle()), rebasedPath.getRoot() })
+                                        .withSkipPCHEnabled (true)
+                                        .withCompilationEnabled (true)
+                                        .withInhibitWarningsEnabled (true)
+                                        .withXcodeTarget (target);
+                };
+
+                if (target->type == XcodeTarget::LV2Helper)
+                    addFile (getFileOptions (getLV2HelperProgramSource()));
+                else if (target->type == XcodeTarget::VST3Helper)
+                    addFile (getFileOptions (getVST3HelperProgramSource()).withCompilerFlags ("-fobjc-arc"));
             }
 
             auto targetName = String (target->getName());