[macOS, Mono] Automatically enable JIT entitlements for the Mono exports. #50317
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bruvzg
added
enhancement
platform:macos
topic:porting
topic:dotnet
cherrypick:3.x
akien-mga
reviewed
Jul 9, 2021
platform/osx/export/export.cpp
Outdated
| @@ -163,9 +164,11 @@ void EditorExportPlatformOSX::get_export_options(List<ExportOption> *r_options) | |||
| r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/replace_existing_signature"), true)); | |||
| r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/entitlements/custom_file", PROPERTY_HINT_GLOBAL_FILE, "*.plist"), "")); | |||
|
|
|||
| #ifndef MODULE_MONO_ENABLED | |||
There was a problem hiding this comment.
I'd add an explanatory comment to make it clear why those are compiled out.
akien-mga
approved these changes
Jul 9, 2021
akien-mga
reviewed
Jul 9, 2021
platform/osx/export/export.cpp
Outdated
| @@ -41,6 +41,7 @@ | |||
| #include "editor/editor_export.h" | |||
| #include "editor/editor_node.h" | |||
| #include "editor/editor_settings.h" | |||
| #include "modules/modules_enabled.gen.h" | |||
There was a problem hiding this comment.
That won't work on 3.x which predates this refactoring:
platform/osx/export/export.cpp:44:10: fatal error: 'modules/modules_enabled.gen.h' file not found
#include "modules/modules_enabled.gen.h"
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
But you can instead rely on if (Engine::get_singleton()->has_singleton("GodotSharp")) to check if there's C# support.
|
Thanks! |
akien-mga
removed
the
cherrypick:3.x
|
Cherry-picked for 3.4. |
|
Should this be cherry-picked to |
|
Cherry-picked for 3.3.4. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatically enable entitlements which are always required to run managed code.