mirror of
https://github.com/godotengine/godot.git
synced 2024-10-23 05:31:54 +00:00
Fix dotnet dev_mode regression
This commit is contained in:
parent
c5291a3555
commit
0d7d4c2a23
|
@ -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 {
|
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
|
#if defined(MODULE_MONO_ENABLED) && !defined(MACOS_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
|
|
||||||
// TODO: Remove this restriction when we don't rely on macOS tools to package up the native libraries anymore.
|
// 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";
|
r_error += TTR("Exporting to iOS when using C#/.NET is experimental and requires macOS.") + "\n";
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#else
|
||||||
#endif
|
|
||||||
|
|
||||||
String err;
|
String err;
|
||||||
bool valid = false;
|
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).
|
// Look for export templates (first official, and if defined custom templates).
|
||||||
|
|
||||||
bool dvalid = exists_export_template("ios.zip", &err);
|
bool dvalid = exists_export_template("ios.zip", &err);
|
||||||
|
@ -1967,6 +1966,7 @@ bool EditorExportPlatformIOS::has_valid_export_configuration(const Ref<EditorExp
|
||||||
}
|
}
|
||||||
|
|
||||||
return valid;
|
return valid;
|
||||||
|
#endif // !(MODULE_MONO_ENABLED && !MACOS_ENABLED)
|
||||||
}
|
}
|
||||||
|
|
||||||
bool EditorExportPlatformIOS::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
|
bool EditorExportPlatformIOS::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user