Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

C#: Fix MSVC dotnet dev_mode regression #83114

Merged
merged 1 commit into from
Oct 10, 2023
+7 −7
Merged

C#: Fix MSVC dotnet dev_mode regression #83114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions platform/ios/export/export_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 {
Expand Down
Loading