diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp index ec922ade4e..f3bf36c95d 100644 --- a/extras/Introjucer/Source/Project/jucer_Module.cpp +++ b/extras/Introjucer/Source/Project/jucer_Module.cpp @@ -340,7 +340,12 @@ void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& pr { Array compiled; - findAndAddCompiledCode (exporter, projectSaver, moduleInfo.getFolder(), compiled); + + const File localModuleFolder = project.getModules().shouldCopyModuleFilesLocally (getID()).getValue() + ? projectSaver.getLocalModuleFolder (getID()) + : moduleInfo.getFolder(); + + findAndAddCompiledCode (exporter, projectSaver, localModuleFolder, compiled); if (project.getModules().shouldShowAllModuleFilesInProject (getID()).getValue()) addBrowsableCode (exporter, projectSaver, compiled, moduleInfo.getFolder()); @@ -524,33 +529,6 @@ void LibraryModule::findAndAddCompiledCode (ProjectExporter& exporter, ProjectSa } } -void LibraryModule::getLocalCompiledFiles (const File& localModuleFolder, Array& result) const -{ - const var compileArray (moduleInfo.moduleInfo ["compile"]); // careful to keep this alive while the array is in use! - - if (const Array* const files = compileArray.getArray()) - { - for (int i = 0; i < files->size(); ++i) - { - const var& file = files->getReference(i); - const String filename (file ["file"].toString()); - - if (filename.isNotEmpty() - #if JUCE_MAC - && exporterTargetMatches ("xcode", file ["target"].toString()) - #elif JUCE_WINDOWS - && exporterTargetMatches ("msvc", file ["target"].toString()) - #elif JUCE_LINUX - && exporterTargetMatches ("linux", file ["target"].toString()) - #endif - ) - { - result.add (localModuleFolder.getChildFile (filename)); - } - } - } -} - static void addFileWithGroups (Project::Item& group, const RelativePath& file, const String& path) { const int slash = path.indexOfChar (File::separator); diff --git a/extras/Introjucer/Source/Project/jucer_Module.h b/extras/Introjucer/Source/Project/jucer_Module.h index b49efd9be3..7f1c1e2db7 100644 --- a/extras/Introjucer/Source/Project/jucer_Module.h +++ b/extras/Introjucer/Source/Project/jucer_Module.h @@ -95,7 +95,6 @@ public: void prepareExporter (ProjectExporter&, ProjectSaver&) const; void createPropertyEditors (ProjectExporter&, PropertyListBuilder&) const; void getConfigFlags (Project&, OwnedArray& flags) const; - void getLocalCompiledFiles (const File& localModuleFolder, Array& files) const; void findBrowseableFiles (const File& localModuleFolder, Array& files) const; ModuleDescription moduleInfo;