diff options
| author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2018-11-08 16:47:15 +0100 |
|---|---|---|
| committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2018-11-08 16:47:15 +0100 |
| commit | 0f3fc930703918ba83b7b83f3ff3849015219a0a (patch) | |
| tree | 6eb166a672b25ee04a46ce06c6a48d78ae337383 /modules/mono | |
| parent | 02d5ff4cd055d2ff29873647840e7b94dc66f072 (diff) | |
Fix assertion fail when loading assembly on project export
Diffstat (limited to 'modules/mono')
| -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); |