Browse Source

Merge pull request #33740 from neikeq/issue-33363

Mono/C#: Bundle libmono-btls-shared.dll on Windows if it exists
Rémi Verschelde 5 years ago
parent
commit
48b8597cee
1 changed files with 5 additions and 0 deletions
  1. 5 0
      modules/mono/build_scripts/mono_configure.py

+ 5 - 0
modules/mono/build_scripts/mono_configure.py

@@ -432,6 +432,11 @@ def copy_mono_shared_libs(env, mono_root, target_mono_root_dir):
             os.makedirs(target_mono_bin_dir)
             os.makedirs(target_mono_bin_dir)
 
 
         copy(os.path.join(mono_root, 'bin', 'MonoPosixHelper.dll'), target_mono_bin_dir)
         copy(os.path.join(mono_root, 'bin', 'MonoPosixHelper.dll'), target_mono_bin_dir)
+
+        # For newer versions
+        btls_dll_path = os.path.join(mono_root, 'bin', 'libmono-btls-shared.dll')
+        if os.path.isfile(btls_dll_path):
+            copy(btls_dll_path, target_mono_bin_dir)
     else:
     else:
         target_mono_lib_dir = get_android_out_dir(env) if platform == 'android' else os.path.join(target_mono_root_dir, 'lib')
         target_mono_lib_dir = get_android_out_dir(env) if platform == 'android' else os.path.join(target_mono_root_dir, 'lib')