From 897334a366baf7beb80f02f771e17e35e4050312 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Tue, 11 Jul 2023 15:11:51 -0500 Subject: Allow MSVC dev_mode builds to succeed with dotnet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Added #else section to mono #ifdef checks in relevant export_plugin scripts --- platform/android/export/export_plugin.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'platform/android/export/export_plugin.cpp') diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index c94119e13d..256807b190 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2228,17 +2228,16 @@ String EditorExportPlatformAndroid::get_apksigner_path(int p_target_sdk, bool p_ } bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref &p_preset, String &r_error, bool &r_missing_templates, bool p_debug) const { - String err; - bool valid = false; - const bool gradle_build_enabled = p_preset->get("gradle_build/use_gradle_build"); - #ifdef MODULE_MONO_ENABLED - err += TTR("Exporting to Android is currently not supported in Godot 4 when using C#/.NET. Use Godot 3 to target Android with C#/Mono instead.") + "\n"; - err += TTR("If this project does not use C#, use a non-C# editor build to export the project.") + "\n"; // Don't check for additional errors, as this particular error cannot be resolved. - r_error = err; + r_error += TTR("Exporting to Android is currently not supported in Godot 4 when using C#/.NET. Use Godot 3 to target Android with C#/Mono instead.") + "\n"; + r_error += TTR("If this project does not use C#, use a non-C# editor build to export the project.") + "\n"; return false; -#endif +#else + + String err; + bool valid = false; + const bool gradle_build_enabled = p_preset->get("gradle_build/use_gradle_build"); // Look for export templates (first official, and if defined custom templates). @@ -2369,6 +2368,7 @@ bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref &p_preset, String &r_error) const { -- cgit v1.2.3