Merge pull request #19310 from hpvb/fix-mingw-static-mono-linking

Fix Mono static linking on Mingw
godotengine · Jun 1, 2018 · 8684b63 · 8684b63
2 parents ff0d295 + f2d669f
commit 8684b63
Showing 1 changed file with 9 additions and 2 deletions.
diff --git 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')