diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-11-08 17:10:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-08 17:10:23 +0100 |
| commit | 9fa1e0b4153102913cddc6380207f5c43e6ebaac (patch) | |
| tree | 324d8902cf26d59d23503b49372b9cede4bae1df /modules | |
| parent | f2e54057aec3a4e4fbb9f9da5729915deb2f4648 (diff) | |
| parent | 0f3fc930703918ba83b7b83f3ff3849015219a0a (diff) | |
Merge pull request #23595 from neikeq/ff
Fix assertion fail when loading assembly on project export
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/config.py | 6 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_export.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/mono/config.py b/modules/mono/config.py index 8427103ee7..189699cca8 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -265,11 +265,7 @@ def make_template_dir(env, mono_root): template_dir_name = '' - if platform == 'windows': - template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target) - elif platform == 'osx': - template_dir_name = 'data.mono.%s.%s' % (platform, target) - elif platform == 'x11': + if platform in ['windows', 'osx', 'x11']: template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target) else: assert False diff --git a/modules/mono/editor/godotsharp_export.cpp b/modules/mono/editor/godotsharp_export.cpp index 509ec961fb..34c710320a 100644 --- a/modules/mono/editor/godotsharp_export.cpp +++ b/modules/mono/editor/godotsharp_export.cpp @@ -117,7 +117,7 @@ void GodotSharpExport::_export_begin(const Set<String> &p_features, bool p_debug GDMonoAssembly *scripts_assembly = NULL; bool load_success = GDMono::get_singleton()->load_assembly_from(project_dll_name, - project_dll_src_dir, &scripts_assembly, /* refonly: */ true); + project_dll_src_path, &scripts_assembly, /* refonly: */ true); ERR_EXPLAIN("Cannot load refonly assembly: " + project_dll_name); ERR_FAIL_COND(!load_success); |