asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #78629 from Calinou/editor-export-mobile-web-csharp-error

Browse source 
Display a message about missing C# support on Android/iOS/Web platforms
This commit is contained in:
Rémi Verschelde 2023-06-24 10:58:29 +02:00 committed by GitHub
commit 24e7502279
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/android/export/export_plugin.cpp
View file

@ -49,7 +49,7 @@
#include "editor/editor_settings.h"
#include "main/splash.gen.h"
#include "modules/modules_enabled.gen.h" // For svg.
#include "modules/modules_enabled.gen.h" // For mono and svg.
#ifdef MODULE_SVG_ENABLED
#include "modules/svg/image_loader_svg.h"
#endif
@ -2232,6 +2232,14 @@ bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref<Edito
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;
return false;
#endif
// Look for export templates (first official, and if defined custom templates).
if (!gradle_build_enabled) {

10
platform/ios/export/export_plugin.cpp
View file

@ -37,7 +37,7 @@
#include "editor/editor_scale.h"
#include "editor/export/editor_export.h"
#include "modules/modules_enabled.gen.h" // For svg.
#include "modules/modules_enabled.gen.h" // For mono and svg.
#ifdef MODULE_SVG_ENABLED
#include "modules/svg/image_loader_svg.h"
#endif
@ -1903,6 +1903,14 @@ bool EditorExportPlatformIOS::has_valid_export_configuration(const Ref<EditorExp
String err;
bool valid = false;
#ifdef MODULE_MONO_ENABLED
err += TTR("Exporting to iOS is currently not supported in Godot 4 when using C#/.NET. Use Godot 3 to target iOS 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;
return false;
#endif
// Look for export templates (first official, and if defined custom templates).
bool dvalid = exists_export_template("ios.zip", &err);

10
platform/web/export/export_plugin.cpp
View file

@ -38,7 +38,7 @@
#include "editor/editor_settings.h"
#include "editor/export/editor_export.h"
#include "modules/modules_enabled.gen.h" // For svg.
#include "modules/modules_enabled.gen.h" // For mono and svg.
#ifdef MODULE_SVG_ENABLED
#include "modules/svg/image_loader_svg.h"
#endif
@ -363,6 +363,14 @@ bool EditorExportPlatformWeb::has_valid_export_configuration(const Ref<EditorExp
bool valid = false;
bool extensions = (bool)p_preset->get("variant/extensions_support");
#ifdef MODULE_MONO_ENABLED
err += TTR("Exporting to Web is currently not supported in Godot 4 when using C#/.NET. Use Godot 3 to target Web 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;
return false;
#endif
// Look for export templates (first official, and if defined custom templates).
bool dvalid = exists_export_template(_get_template_name(extensions, true), &err);
bool rvalid = exists_export_template(_get_template_name(extensions, false), &err);