godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix copying Mono shared libs on macOS

Browse Source
This commit is contained in:
Ignacio Roldán Etchevery 2021-05-21 05:52:57 +02:00
parent 683f96df35
commit 7569f2dccb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/mono/build_scripts/mono_configure.py
View File

@ -551,12 +551,16 @@ def copy_mono_shared_libs(env, mono_root, target_mono_root_dir):
if not os.path.isdir(target_mono_lib_dir): if not os.path.isdir(target_mono_lib_dir):
os.makedirs(target_mono_lib_dir) os.makedirs(target_mono_lib_dir)
src_mono_lib_dir = os.path.join(mono_root, "lib")
lib_file_names = [] lib_file_names = []
if platform == "osx": if platform == "osx":
lib_file_names = [ lib_file_names = [lib_name + ".dylib" for lib_name in ["libmono-btls-shared", "libMonoPosixHelper"]]
lib_name + ".dylib"
for lib_name in ["libmono-btls-shared", "libmono-native-compat", "libMonoPosixHelper"] if os.path.isfile(os.path.join(src_mono_lib_dir, "libmono-native-compat.dylib")):
] lib_file_names += ["libmono-native-compat.dylib"]
else:
lib_file_names += ["libmono-native.dylib"]
elif is_unix_like(platform): elif is_unix_like(platform):
lib_file_names = [ lib_file_names = [
lib_name + ".so" lib_name + ".so"
@ -573,7 +577,7 @@ def copy_mono_shared_libs(env, mono_root, target_mono_root_dir):
] ]
for lib_file_name in lib_file_names: for lib_file_name in lib_file_names:
copy_if_exists(os.path.join(mono_root, "lib", lib_file_name), target_mono_lib_dir) copy_if_exists(os.path.join(src_mono_lib_dir, lib_file_name), target_mono_lib_dir)
def pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext): def pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext):