diff options
| author | Hein-Pieter van Braam | 2018-06-01 21:45:21 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-06-01 21:45:21 +0200 |
| commit | f6406398670f41b55cd8e47bf5d8a1e764fb0c02 (patch) | |
| tree | 0f799fddf7c330836b19f42a3274a057a100fff6 | |
| parent | d24f77be99321d857285daddac0dda7128e348ed (diff) | |
| download | godot-f6406398670f41b55cd8e47bf5d8a1e764fb0c02.tar.gz godot-f6406398670f41b55cd8e47bf5d8a1e764fb0c02.tar.zst godot-f6406398670f41b55cd8e47bf5d8a1e764fb0c02.zip | |
Fix Mono static linking on Mingw
Diffstat (limited to '')
| -rw-r--r-- | modules/mono/config.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/modules/mono/config.py b/modules/mono/config.py index d0a3b7bcb..249477b41 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -80,7 +80,11 @@ def configure(env): if mono_static: lib_suffix = Environment()['LIBSUFFIX'] - mono_static_lib_name = 'libmono-static-sgen' + + if env.msvc: + mono_static_lib_name = 'libmono-static-sgen' + else: + mono_static_lib_name = 'libmonosgen-2.0' if not os.path.isfile(os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)): raise RuntimeError('Could not find static mono library in: ' + mono_lib_path) @@ -93,7 +97,10 @@ def configure(env): env.Append(LINKFLAGS='LIBCMT' + lib_suffix) env.Append(LINKFLAGS='Psapi' + lib_suffix) else: - env.Append(LIBS=mono_static_lib_name) + env.Append(LINKFLAGS=os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)) + + env.Append(LIBS='psapi') + env.Append(LIBS='version') else: mono_lib_name = find_file_in_dir(mono_lib_path, mono_lib_names, extension='.lib') |