Browse Source

Fixed a problem with introjucer module file target parsing.

tags/2021-05-28
jules 13 years ago
parent
commit
d4fb934a26
2 changed files with 22 additions and 10 deletions
  1. +17
    -5
      extras/Introjucer/Source/Project/jucer_Module.cpp
  2. +5
    -5
      modules/juce_audio_plugin_client/juce_module_info

+ 17
- 5
extras/Introjucer/Source/Project/jucer_Module.cpp View File

@@ -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)


+ 5
- 5
modules/juce_audio_plugin_client/juce_module_info View File

@@ -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" }
],


Loading…
Cancel
Save