Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-16 15:50:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #83114 from Repiteo/fix-dotnet-dev-build-regression

Browse Source 
C#: Fix MSVC dotnet `dev_mode` regression
This commit is contained in:
Rémi Verschelde 2023-10-10 22:52:04 +02:00
commit 918f046354
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/ios/export/export_plugin.cpp
View File

@ -1927,20 +1927,19 @@ Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPres
}
bool EditorExportPlatformIOS::has_valid_export_configuration(const Ref<EditorExportPreset> &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<EditorExp
}
return valid;
#endif // !(MODULE_MONO_ENABLED && !MACOS_ENABLED)
}
bool EditorExportPlatformIOS::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {