diff --git a/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineClient.cpp b/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineClient.cpp index fdaa55c44f..d8f5cba595 100644 --- a/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineClient.cpp +++ b/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineClient.cpp @@ -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(); diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 24d48f840b..ecac743c2a 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -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); } //============================================================================== diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index bed3870db8..65ea1936d5 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -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; diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index 4287ce5d33..4fa3e97563 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -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();