diff options
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/doc_classes/EditorExportPlatformIOS.xml | 2 | ||||
| -rw-r--r-- | platform/ios/export/export_plugin.cpp | 10 | ||||
| -rw-r--r-- | platform/ios/os_ios.mm | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/platform/ios/doc_classes/EditorExportPlatformIOS.xml b/platform/ios/doc_classes/EditorExportPlatformIOS.xml index b37868e543..346cc9bf35 100644 --- a/platform/ios/doc_classes/EditorExportPlatformIOS.xml +++ b/platform/ios/doc_classes/EditorExportPlatformIOS.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="EditorExportPlatformIOS" inherits="EditorExportPlatform" version="4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd"> +<class name="EditorExportPlatformIOS" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd"> <brief_description> Exporter for iOS. </brief_description> diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index 4860ef0ad7..456a137229 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -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); diff --git a/platform/ios/os_ios.mm b/platform/ios/os_ios.mm index 461c226070..50102e02cc 100644 --- a/platform/ios/os_ios.mm +++ b/platform/ios/os_ios.mm @@ -257,7 +257,7 @@ Error OS_IOS::open_dynamic_library(const String p_path, void *&p_library_handle, } p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW); - ERR_FAIL_COND_V_MSG(!p_library_handle, ERR_CANT_OPEN, "Can't open dynamic library: " + p_path + ", error: " + dlerror() + "."); + ERR_FAIL_COND_V_MSG(!p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); if (r_resolved_path != nullptr) { *r_resolved_path = path; |