diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-22 10:07:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 10:07:21 +0200 |
| commit | 8a1e5980116355024cd7a7ce0c15db7d4ecb200a (patch) | |
| tree | fc40366fb5ad00f6b01e0b796ef85495433bd26f /modules/mono/config.py | |
| parent | 847183093d2948601cdd82f50a333bdee2d6eef0 (diff) | |
| parent | 9c34a02191bc6c560cc2a1bceea943f9bd8aebfa (diff) | |
Merge pull request #64089 from neikeq/dotnet6
Diffstat (limited to 'modules/mono/config.py')
| -rw-r--r-- | modules/mono/config.py | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/modules/mono/config.py b/modules/mono/config.py index d895d2d92d..d156877929 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -1,4 +1,6 @@ -supported_platforms = ["windows", "macos", "linuxbsd", "server", "android", "haiku", "javascript", "ios"] +# Prior to .NET Core, we supported these: ["windows", "macos", "linuxbsd", "server", "android", "haiku", "javascript", "ios"] +# Eventually support for each them should be added back (except Haiku if not supported by .NET Core) +supported_platforms = ["windows", "macos", "linuxbsd", "server"] def can_build(env, platform): @@ -13,26 +15,11 @@ def get_opts(platform): return [ PathVariable( - "mono_prefix", - "Path to the Mono installation directory for the target platform and architecture", + "dotnet_root", + "Path to the .NET Sdk installation directory for the target platform and architecture", "", PathVariable.PathAccept, ), - PathVariable( - "mono_bcl", - "Path to a custom Mono BCL (Base Class Library) directory for the target platform", - "", - PathVariable.PathAccept, - ), - BoolVariable("mono_static", "Statically link Mono", default_mono_static), - BoolVariable("mono_glue", "Build with the Mono glue sources", True), - BoolVariable("build_cil", "Build C# solutions", True), - BoolVariable( - "copy_mono_root", "Make a copy of the Mono installation directory to bundle with the editor", True - ), - BoolVariable( - "mono_bundles_zlib", "Specify if the Mono runtime was built with bundled zlib", default_mono_bundles_zlib - ), ] @@ -44,13 +31,6 @@ def configure(env): env.add_module_version_string("mono") - if env["mono_bundles_zlib"]: - # Mono may come with zlib bundled for WASM or on newer version when built with MinGW. - print("This Mono runtime comes with zlib bundled. Disabling 'builtin_zlib'...") - env["builtin_zlib"] = False - thirdparty_zlib_dir = "#thirdparty/zlib/" - env.Prepend(CPPPATH=[thirdparty_zlib_dir]) - def get_doc_classes(): return [ |