mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Modify examples directory search so that the directory can be found when the DemoRunner is in the JUCE root folder

Browse source
This commit is contained in:
hogliux 2018-03-15 14:37:10 +00:00
parent 9c54ccc99b
commit ce810ff0b9
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/Assets/DemoUtilities.h
View file

@ -59,6 +59,10 @@ inline File getExamplesDirectory() noexcept
return mo.toString(); return mo.toString();
#else #else
auto currentFile = File::getSpecialLocation (File::SpecialLocationType::currentExecutableFile); auto currentFile = File::getSpecialLocation (File::SpecialLocationType::currentExecutableFile);
auto exampleDir = currentFile.getParentDirectory().getChildFile ("examples");
if (exampleDir.exists())
return exampleDir;
int numTries = 0; // keep track of the number of parent directories so we don't go on endlessly int numTries = 0; // keep track of the number of parent directories so we don't go on endlessly

6
examples/DemoRunner/Source/Demos/JUCEDemos.cpp
View file

@ -67,13 +67,15 @@ void JUCEDemos::registerDemo (std::function<Component*()> constructorCallback, c
File JUCEDemos::findExamplesDirectoryFromExecutable (File exec) File JUCEDemos::findExamplesDirectoryFromExecutable (File exec)
{ {
int numTries = 15; int numTries = 15;
auto exampleDir = exec.getParentDirectory().getChildFile ("examples");
if (exampleDir.exists())
return exampleDir;
while (exec.getFileName() != "examples" && numTries-- > 0) while (exec.getFileName() != "examples" && numTries-- > 0)
exec = exec.getParentDirectory(); exec = exec.getParentDirectory();
if (exec.getFileName() == "examples") if (exec.getFileName() == "examples")
return exec; return exec;
return {}; return {};
} }