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

Projucer: Updated some code that was using an incorrect method to get module config flags

Browse source
This commit is contained in:
ed 2020-02-26 16:22:42 +00:00
parent 2269cf8168
commit 11b184e43f
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineClient.cpp
View file

@ -375,7 +375,7 @@ private:
{
auto isVSTHost = project.getEnabledModules().isModuleEnabled ("juce_audio_processors")
&& (project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST3") || project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST"));
&& (project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST3", false) || project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST", false));
auto isPluginProject = proj.isAudioPluginProject();
@ -463,8 +463,8 @@ private:
paths.addArray (getSearchPathsFromString (project.getCompileEngineSettings().getSystemHeaderPathString()));
auto isVSTHost = project.getEnabledModules().isModuleEnabled ("juce_audio_processors")
&& (project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST3")
|| project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST"));
&& (project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST3", false)
|| project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST", false));
auto customVst3Path = getAppSettings().getStoredPath (Ids::vst3Path, TargetOS::getThisOS()).get().toString();

6
extras/Projucer/Source/Project/jucer_Project.cpp
View file

@ -1889,17 +1889,17 @@ String Project::getIAAPluginName()
//==============================================================================
bool Project::isAUPluginHost()
{
return getEnabledModules().isModuleEnabled ("juce_audio_processors") && isConfigFlagEnabled ("JUCE_PLUGINHOST_AU");
return getEnabledModules().isModuleEnabled ("juce_audio_processors") && isConfigFlagEnabled ("JUCE_PLUGINHOST_AU", false);
}
bool Project::isVSTPluginHost()
{
return getEnabledModules().isModuleEnabled ("juce_audio_processors") && isConfigFlagEnabled ("JUCE_PLUGINHOST_VST");
return getEnabledModules().isModuleEnabled ("juce_audio_processors") && isConfigFlagEnabled ("JUCE_PLUGINHOST_VST", false);
}
bool Project::isVST3PluginHost()
{
return getEnabledModules().isModuleEnabled ("juce_audio_processors") && isConfigFlagEnabled ("JUCE_PLUGINHOST_VST3");
return getEnabledModules().isModuleEnabled ("juce_audio_processors") && isConfigFlagEnabled ("JUCE_PLUGINHOST_VST3", false);
}
//==============================================================================

8
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
View file

@ -360,7 +360,9 @@ private:
if (! isLibrary())
mo << "SET(BINARY_NAME \"juce_jni\")" << newLine << newLine;
if (project.getConfigFlag ("JUCE_USE_ANDROID_OBOE").get())
auto useOboe = project.getEnabledModules().isModuleEnabled ("juce_audio_devices") && project.isConfigFlagEnabled ("JUCE_USE_ANDROID_OBOE", false);
if (useOboe)
{
String oboePath (androidOboeRepositoryPath.get().toString().trim().quoted());
@ -386,7 +388,7 @@ private:
mo << " \"${ANDROID_NDK}/sources/android/cpufeatures\"" << newLine;
if (project.getConfigFlag ("JUCE_USE_ANDROID_OBOE").get())
if (useOboe)
mo << " \"${OBOE_DIR}/include\"" << newLine;
mo << ")" << newLine << newLine;
@ -541,7 +543,7 @@ private:
mo << " \"cpufeatures\"" << newLine;
}
if (project.getConfigFlag ("JUCE_USE_ANDROID_OBOE").get())
if (useOboe)
mo << " \"oboe\"" << newLine;
mo << ")" << newLine;

6
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
View file

@ -2663,8 +2663,12 @@ private:
if (iOS && isPushNotificationsEnabled())
xcodeFrameworks.addIfNotAlreadyThere ("UserNotifications");
if (isiOS() && project.getConfigFlag ("JUCE_USE_CAMERA").get())
if (iOS
&& project.getEnabledModules().isModuleEnabled ("juce_video")
&& project.isConfigFlagEnabled ("JUCE_USE_CAMERA", false))
{
xcodeFrameworks.addIfNotAlreadyThere ("ImageIO");
}
xcodeFrameworks.addTokens (getExtraFrameworksString(), ",;", "\"'");
xcodeFrameworks.trim();