mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-24 19:51:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix dynamic linking of MSVC Mono with MinGW Godot

Browse source
This commit is contained in:
Ignacio Etcheverry 2020-06-15 21:29:50 +02:00
parent 54df72dcc6
commit 7756351f47
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/mono/build_scripts/mono_configure.py
View file

@ -191,17 +191,16 @@ def configure(env, env_mono):
env.Append(LIBS=["psapi"]) env.Append(LIBS=["psapi"])
env.Append(LIBS=["version"]) env.Append(LIBS=["version"])
else: else:
mono_lib_name = find_name_in_dir_files( mono_lib_file = find_file_in_dir(mono_lib_path, mono_lib_names, extensions=lib_suffixes)
mono_lib_path, mono_lib_names, prefixes=["", "lib"], extensions=lib_suffixes
)
if not mono_lib_name: if not mono_lib_file:
raise RuntimeError("Could not find mono library in: " + mono_lib_path) raise RuntimeError("Could not find mono library in: " + mono_lib_path)
if env.msvc: if env.msvc:
env.Append(LINKFLAGS=mono_lib_name + ".lib") env.Append(LINKFLAGS=mono_lib_file)
else: else:
env.Append(LIBS=[mono_lib_name]) mono_lib_file_path = os.path.join(mono_lib_path, mono_lib_file)
env.Append(LINKFLAGS=mono_lib_file_path)
mono_bin_path = os.path.join(mono_root, "bin") mono_bin_path = os.path.join(mono_root, "bin")