Skip to content

Commit 006ddd5

Browse files
Merge branch 'godotengine:master' into master
2 parents 459f21f + 3521a55 commit 006ddd5

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

engine_details/development/compiling/compiling_for_ios.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ The MoltenVK static ``.xcframework`` folder must also be placed in the
7474
``ios_xcode`` folder once it has been created. MoltenVK is always statically
7575
linked on iOS; there is no dynamic linking option available, unlike macOS.
7676

77+
.. warning::
78+
79+
Compiling for the iOS simulator is currently not supported as per
80+
`GH-102149 <https://github.com/godotengine/godot/issues/102149>`__.
81+
82+
Apple Silicon Macs can run iOS apps natively, so you can run exported iOS projects
83+
directly on an Apple Silicon Mac without needing the iOS simulator.
84+
7785
Run
7886
---
7987

tutorials/export/exporting_for_ios.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@ When the export completes, the output folder should look like this:
5757

5858
.. image:: img/ios_export_output.webp
5959

60+
61+
.. warning::
62+
63+
Exporting for the iOS simulator is currently not supported as per
64+
`GH-102149 <https://github.com/godotengine/godot/issues/102149>`__.
65+
66+
Apple Silicon Macs can run iOS apps natively, so you can run exported iOS projects
67+
directly on an Apple Silicon Mac without needing the iOS simulator.
68+
6069
Opening **exported_xcode_project_name.xcodeproj** lets you build and deploy
6170
like any other iOS app.
6271

tutorials/scripting/logging.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ Here is a minimal working example of a custom logger, with the script added as a
225225
func _log_message(message: String, error: bool) -> void:
226226
# Do something with `message`.
227227
# `error` is `true` for messages printed to the standard error stream (stderr) with `print_error()`.
228+
# Note that this method will be called from threads other than the main thread, possibly at the same
229+
# time, so you will need to have some kind of thread-safety as part of it, like a Mutex.
228230
pass
229231
230232
func _log_error(
@@ -239,6 +241,8 @@ Here is a minimal working example of a custom logger, with the script added as a
239241
) -> void:
240242
# Do something with the error. The error text is in `rationale`.
241243
# See the Logger class reference for details on other parameters.
244+
# Note that this method will be called from threads other than the main thread, possibly at the same
245+
# time, so you will need to have some kind of thread-safety as part of it, like a Mutex.
242246
pass
243247
244248
# Use `_init()` to initialize the logger as early as possible, which ensures that messages

0 commit comments

Comments
 (0)