From 0d7d4c2a23e6a85a40fed4d627ae7cb3a19320ce Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Tue, 10 Oct 2023 11:48:51 -0500 Subject: [PATCH] Fix dotnet dev_mode regression --- platform/ios/export/export_plugin.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index ed92cac59334..76546c164a9d 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -1927,20 +1927,19 @@ Error EditorExportPlatformIOS::_export_project_helper(const Ref &p_preset, String &r_error, bool &r_missing_templates, bool p_debug) const { -#ifdef MODULE_MONO_ENABLED -#ifdef MACOS_ENABLED - // iOS export is still a work in progress, keep a message as a warning. - r_error += TTR("Exporting to iOS when using C#/.NET is experimental.") + "\n"; -#else +#if defined(MODULE_MONO_ENABLED) && !defined(MACOS_ENABLED) // TODO: Remove this restriction when we don't rely on macOS tools to package up the native libraries anymore. r_error += TTR("Exporting to iOS when using C#/.NET is experimental and requires macOS.") + "\n"; return false; -#endif -#endif +#else String err; bool valid = false; +#if defined(MODULE_MONO_ENABLED) + // iOS export is still a work in progress, keep a message as a warning. + err += TTR("Exporting to iOS when using C#/.NET is experimental.") + "\n"; +#endif // Look for export templates (first official, and if defined custom templates). bool dvalid = exists_export_template("ios.zip", &err); @@ -1967,6 +1966,7 @@ bool EditorExportPlatformIOS::has_valid_export_configuration(const Ref &p_preset, String &r_error) const {