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

Fix MSVC check when building with mono 

(cherry picked from commit a1aa98e05a)
This commit is contained in:
Ignacio Etcheverry 2018-05-02 15:19:02 +02:00 committed by Hein-Pieter van Braam
parent 0b9f61c9a6
commit 664052824e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/config.py
View File

@ -85,7 +85,7 @@ def configure(env):
if not os.path.isfile(os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)): 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) raise RuntimeError('Could not find static mono library in: ' + mono_lib_path)
if os.getenv('VCINSTALLDIR'): if env.msvc:
env.Append(LINKFLAGS=mono_static_lib_name + lib_suffix) env.Append(LINKFLAGS=mono_static_lib_name + lib_suffix)
env.Append(LINKFLAGS='Mincore' + lib_suffix) env.Append(LINKFLAGS='Mincore' + lib_suffix)
@ -100,7 +100,7 @@ def configure(env):
if not mono_lib_name: if not mono_lib_name:
raise RuntimeError('Could not find mono library in: ' + mono_lib_path) raise RuntimeError('Could not find mono library in: ' + mono_lib_path)
if os.getenv('VCINSTALLDIR'): if env.msvc:
env.Append(LINKFLAGS=mono_lib_name + Environment()['LIBSUFFIX']) env.Append(LINKFLAGS=mono_lib_name + Environment()['LIBSUFFIX'])
else: else:
env.Append(LIBS=mono_lib_name) env.Append(LIBS=mono_lib_name)