diff options
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/config.py | 4 | ||||
| -rw-r--r-- | modules/mono/utils/mono_reg_utils.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/mono/config.py b/modules/mono/config.py index 18da468bba..18d9c67795 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -85,7 +85,7 @@ def configure(env): 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) - if os.getenv('VCINSTALLDIR'): + if env.msvc: env.Append(LINKFLAGS=mono_static_lib_name + lib_suffix) env.Append(LINKFLAGS='Mincore' + lib_suffix) @@ -100,7 +100,7 @@ def configure(env): if not mono_lib_name: 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']) else: env.Append(LIBS=mono_lib_name) diff --git a/modules/mono/utils/mono_reg_utils.cpp b/modules/mono/utils/mono_reg_utils.cpp index 9bb8da8ac0..7b23cd7579 100644 --- a/modules/mono/utils/mono_reg_utils.cpp +++ b/modules/mono/utils/mono_reg_utils.cpp @@ -174,6 +174,8 @@ String find_msbuild_tools_path() { List<String> vswhere_args; vswhere_args.push_back("-latest"); + vswhere_args.push_back("-products"); + vswhere_args.push_back("*"); vswhere_args.push_back("-requires"); vswhere_args.push_back("Microsoft.Component.MSBuild"); |