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

Introjucer: fix for finding modules on linux.

Browse source
This commit is contained in:
jules 2013-10-02 10:56:02 +01:00
parent 94aca67a9b
commit 20fa1be6ed
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h
View file

@ -57,12 +57,26 @@ public:
virtual bool isXcode() const { return false; }
virtual bool isVisualStudio() const { return false; }
virtual bool isWindows() const { return false; }
virtual int getVisualStudioVersion() const { return 0; }
virtual bool isCodeBlocks() const { return false; }
virtual bool isAndroid() const { return false; }
virtual bool isWindows() const { return false; }
virtual bool isLinux() const { return false; }
virtual bool isOSX() const { return false; }
virtual bool isAndroid() const { return false; }
virtual bool isCodeBlocks() const { return false; }
bool mayCompileOnCurrentOS() const
{
#if JUCE_MAC
return isOSX() || isAndroid();
#elif JUCE_WINDOWS
return isWindows() || isAndroid();
#elif JUCE_LINUX
return isLinux() || isAndroid();
#else
#error
#endif
}
//==============================================================================
String getName() const { return name; }

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

@ -124,7 +124,7 @@ static Array<File> getAllPossibleModulePaths (Project& project)
for (Project::ExporterIterator exporter (project); exporter.next();)
{
if (exporter->canLaunchProject())
if (exporter->mayCompileOnCurrentOS())
{
for (int i = 0; i < project.getModules().getNumModules(); ++i)
{
@ -185,7 +185,7 @@ bool ModuleList::loadFromWebsite()
URL baseURL ("http://www.juce.com/juce/modules");
URL url (baseURL.getChildURL ("modulelist.php"));
const ScopedPointer<InputStream> in (url.createInputStream (false, nullptr, nullptr, String::empty, 10000));
const ScopedPointer<InputStream> in (url.createInputStream (false, nullptr, nullptr, String::empty, 4000));
if (in == nullptr)
return false;
@ -633,7 +633,7 @@ File EnabledModuleList::getModuleInfoFile (const String& moduleID)
{
for (Project::ExporterIterator exporter (project); exporter.next();)
{
if (exporter->canLaunchProject())
if (exporter->mayCompileOnCurrentOS())
{
const String path (exporter->getPathForModuleString (moduleID));