瀏覽代碼

Fix assertion fail when loading assembly on project export

Ignacio Etcheverry 6 年之前
父節點
當前提交
0f3fc93070
共有 2 個文件被更改,包括 2 次插入6 次删除
  1. 1 5
      modules/mono/config.py
  2. 1 1
      modules/mono/editor/godotsharp_export.cpp

+ 1 - 5
modules/mono/config.py

@@ -265,11 +265,7 @@ def make_template_dir(env, mono_root):
 
 
     template_dir_name = ''
     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)
         template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target)
     else:
     else:
         assert False
         assert False

+ 1 - 1
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;
 		GDMonoAssembly *scripts_assembly = NULL;
 		bool load_success = GDMono::get_singleton()->load_assembly_from(project_dll_name,
 		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_EXPLAIN("Cannot load refonly assembly: " + project_dll_name);
 		ERR_FAIL_COND(!load_success);
 		ERR_FAIL_COND(!load_success);