From e59a81dd9c87bd236d6efe51d473bc6000fb9420 Mon Sep 17 00:00:00 2001 From: hogliux Date: Sun, 5 Mar 2017 18:03:33 +0000 Subject: [PATCH] Cleaned up some code in recent commits in the Projucer's XCode exporter --- .../Project Saving/jucer_ProjectExport_XCode.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h index b0602593b8..e48dba8179 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -604,8 +604,6 @@ public: xcodeBundleExtension = ".dpm"; xcodeProductType = "com.apple.product-type.bundle"; xcodeCopyToProductInstallPathAfterBuild = true; - - addExtraRTASTargetSettings(); break; case SharedCodeTarget: @@ -1320,6 +1318,13 @@ public: extraLibs.add (aaxLibsFolder.getChildFile (libraryPath)); } + else if (type == RTASPlugIn) + { + RelativePath rtasFolder (owner.getRTASPathValue().toString(), RelativePath::projectFolder); + + extraLibs.add (rtasFolder.getChildFile ("MacBag/Libs/Debug/libPluginLibrary.a")); + extraLibs.add (rtasFolder.getChildFile ("MacBag/Libs/Release/libPluginLibrary.a")); + } } StringArray getTargetExtraHeaderSearchPaths() const @@ -1370,14 +1375,6 @@ public: return targetExtraSearchPaths; } - void addExtraRTASTargetSettings() - { - RelativePath rtasFolder (owner.getRTASPathValue().toString(), RelativePath::projectFolder); - - xcodeExtraLibrariesDebug.add (rtasFolder.getChildFile ("MacBag/Libs/Debug/libPluginLibrary.a")); - xcodeExtraLibrariesRelease.add (rtasFolder.getChildFile ("MacBag/Libs/Release/libPluginLibrary.a")); - } - bool isUsingClangCppLibrary (const BuildConfiguration& config) const { if (auto xcodeConfig = dynamic_cast (&config))