mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-14 00:14:18 +00:00
Code Activity

Introjucer: made modules work better when the project doesn't contain any targets that will build on the current OS.

Browse source
This commit is contained in:
jules 2013-11-12 10:29:04 +00:00
parent a4e611222d
commit 5ffd878ebc
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
extras/Introjucer/Source/Project/jucer_Module.cpp
View file

@ -131,21 +131,18 @@ static Array<File> getAllPossibleModulePaths (Project& project)
for (Project::ExporterIterator exporter (project); exporter.next();)
{
if (exporter->mayCompileOnCurrentOS())
for (int i = 0; i < project.getModules().getNumModules(); ++i)
{
for (int i = 0; i < project.getModules().getNumModules(); ++i)
{
const String path (exporter->getPathForModuleString (project.getModules().getModuleID (i)));
const String path (exporter->getPathForModuleString (project.getModules().getModuleID (i)));
if (path.isNotEmpty())
paths.addIfNotAlreadyThere (path);
}
String oldPath (exporter->getLegacyModulePath());
if (oldPath.isNotEmpty())
paths.addIfNotAlreadyThere (oldPath);
if (path.isNotEmpty())
paths.addIfNotAlreadyThere (path);
}
String oldPath (exporter->getLegacyModulePath());
if (oldPath.isNotEmpty())
paths.addIfNotAlreadyThere (oldPath);
}
Array<File> files;
@ -619,11 +616,11 @@ Value EnabledModuleList::shouldShowAllModuleFilesInProject (const String& module
.getPropertyAsValue (Ids::showAllCode, getUndoManager());
}
File EnabledModuleList::getModuleInfoFile (const String& moduleID)
File EnabledModuleList::findLocalModuleInfoFile (const String& moduleID, bool useExportersForOtherOSes)
{
for (Project::ExporterIterator exporter (project); exporter.next();)
{
if (exporter->mayCompileOnCurrentOS())
if (useExportersForOtherOSes || exporter->mayCompileOnCurrentOS())
{
const String path (exporter->getPathForModuleString (moduleID));
@ -658,6 +655,16 @@ File EnabledModuleList::getModuleInfoFile (const String& moduleID)
return File::nonexistent;
}
File EnabledModuleList::getModuleInfoFile (const String& moduleID)
{
const File f (findLocalModuleInfoFile (moduleID, false));
if (f != File::nonexistent)
return f;
return findLocalModuleInfoFile (moduleID, true);
}
File EnabledModuleList::getModuleFolder (const String& moduleID)
{
const File infoFile (getModuleInfoFile (moduleID));