From d4fb934a2690888b41ea1e2945a85e84252f3e62 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Sat, 26 May 2012 11:02:56 +0100
Subject: [PATCH] Fixed a problem with introjucer module file target parsing.

---
 .../Source/Project/jucer_Module.cpp           | 22 ++++++++++++++-----
 .../juce_audio_plugin_client/juce_module_info | 10 ++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp
index 6da327eea1..ad7e551124 100644
--- a/extras/Introjucer/Source/Project/jucer_Module.cpp
+++ b/extras/Introjucer/Source/Project/jucer_Module.cpp
@@ -586,12 +586,24 @@ void LibraryModule::getConfigFlags (Project& project, OwnedArray<Project::Config
 //==============================================================================
 static bool exporterTargetMatches (const String& test, String target)
 {
-    target = target.trim();
-
-    if (target.startsWithChar ('!'))
-        return ! exporterTargetMatches (test, target.substring (1).trimStart());
+    StringArray validTargets;
+    validTargets.addTokens (target, ",;", "");
+    validTargets.trim();
+    validTargets.removeEmptyStrings();
+    
+    if (validTargets.size() == 0)
+        return true;
+
+    for (int i = validTargets.size(); --i >= 0;)
+    {
+        const String& target = validTargets[i];
 
-    return target == test || target.isEmpty();
+        if (target == test
+             || (target.startsWithChar ('!') && test != target.substring (1).trimStart()))
+            return true;
+    }
+    
+    return false;
 }
 
 bool LibraryModule::fileTargetMatches (ProjectExporter& exporter, const String& target)
diff --git a/modules/juce_audio_plugin_client/juce_module_info b/modules/juce_audio_plugin_client/juce_module_info
index f242c8e7ca..729860bd5e 100644
--- a/modules/juce_audio_plugin_client/juce_module_info
+++ b/modules/juce_audio_plugin_client/juce_module_info
@@ -14,17 +14,17 @@
 
   "compile":        [ { "file": "VST/juce_VST_Wrapper.cpp" },
                       { "file": "VST/juce_VST_Wrapper.mm", "target": "xcode" },
-                      { "file": "RTAS/juce_RTAS_DigiCode1.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode", "target": "msvc" },
-                      { "file": "RTAS/juce_RTAS_DigiCode2.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode", "target": "msvc" },
-                      { "file": "RTAS/juce_RTAS_DigiCode3.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode", "target": "msvc" },
+                      { "file": "RTAS/juce_RTAS_DigiCode1.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode, msvc" },
+                      { "file": "RTAS/juce_RTAS_DigiCode2.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode, msvc" },
+                      { "file": "RTAS/juce_RTAS_DigiCode3.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode, msvc" },
                       { "file": "RTAS/juce_RTAS_MacResources.r", "target": "xcode" },
                       { "file": "RTAS/juce_RTAS_MacUtilities.mm", "target": "xcode" },
                       { "file": "RTAS/juce_RTAS_WinResources.rsr", "target": "msvc" },
                       { "file": "RTAS/juce_RTAS_WinUtilities.cpp", "target": "msvc", "warnings": "disabled", "stdcall": "1" },
-                      { "file": "RTAS/juce_RTAS_Wrapper.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode", "target": "msvc" },
+                      { "file": "RTAS/juce_RTAS_Wrapper.cpp", "warnings": "disabled", "stdcall": "1", "target": "xcode, msvc" },
                       { "file": "AU/juce_AU_Resources.r", "target": "xcode" },
                       { "file": "AU/juce_AU_Wrapper.mm", "target": "xcode" },
-                      { "file": "AAX/juce_AAX_Wrapper.cpp", "target": "xcode", "target": "msvc" },
+                      { "file": "AAX/juce_AAX_Wrapper.cpp", "target": "xcode, msvc" },
                       { "file": "AAX/juce_AAX_Wrapper.mm", "target": "xcode" }
                     ],