From 8c9315ab12eda095c54ca1db4d7729e554acd2af Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Fri, 17 Aug 2018 18:46:08 +0100
Subject: [PATCH] Fix for projucer's command-line option handling

---
 extras/Projucer/Source/Application/jucer_CommandLine.cpp | 2 +-
 modules/juce_core/misc/juce_ConsoleApplication.cpp       | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/extras/Projucer/Source/Application/jucer_CommandLine.cpp b/extras/Projucer/Source/Application/jucer_CommandLine.cpp
index 42a7f738c8..39e57c57f7 100644
--- a/extras/Projucer/Source/Application/jucer_CommandLine.cpp
+++ b/extras/Projucer/Source/Application/jucer_CommandLine.cpp
@@ -376,7 +376,7 @@ namespace
 
         for (auto it = args.arguments.begin() + 1; it < args.arguments.end(); ++it)
         {
-            auto target = it->resolveAsExistingFile();
+            auto target = it->resolveAsFile();
 
             Array<File> files;
 
diff --git a/modules/juce_core/misc/juce_ConsoleApplication.cpp b/modules/juce_core/misc/juce_ConsoleApplication.cpp
index dce3626068..ccc76b9b86 100644
--- a/modules/juce_core/misc/juce_ConsoleApplication.cpp
+++ b/modules/juce_core/misc/juce_ConsoleApplication.cpp
@@ -73,8 +73,11 @@ static bool compareOptionStrings (StringRef s1, StringRef s2)
     if (s1 == s2)
         return true;
 
-    for (auto& part1 : StringArray::fromTokens (s1, "|", {}))
-        for (auto& part2 : StringArray::fromTokens (s2, "|", {}))
+    auto toks1 = StringArray::fromTokens (s1, "|", {});
+    auto toks2 = StringArray::fromTokens (s2, "|", {});
+
+    for (auto& part1 : toks1)
+        for (auto& part2 : toks2)
             if (part1.trim() == part2.trim())
                 return true;