diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-19 19:36:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 19:36:08 +0100 |
| commit | 48b8597cee5bf9b5f8cc3449eda681a14d0704f2 (patch) | |
| tree | 90d41d982d96d20793712345bd212d0fa6175e96 | |
| parent | 95f1f4e82a948f064bbbe32812a3f4b5c3c90bb7 (diff) | |
| parent | 3f247ea5072adec86e6433006fd80539d0376297 (diff) | |
Merge pull request #33740 from neikeq/issue-33363
Mono/C#: Bundle libmono-btls-shared.dll on Windows if it exists
| -rw-r--r-- | modules/mono/build_scripts/mono_configure.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index e83c3f19a6..5388061f84 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/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) 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: target_mono_lib_dir = get_android_out_dir(env) if platform == 'android' else os.path.join(target_mono_root_dir, 'lib') |