Skip to content

C
core
Kaydet (Commit) 79c9ea38 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Fix build breaker in cli_ure: Avoid C# 4.0 when using MSVC 2008 

Change-Id: Ieb82b73150330ddbde890f36b88637bf5dfddf51
üst 6abaf44f
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 5 deletions
oowintool
Dosyayı görüntüle @ 79c9ea38
......@@ -212,11 +212,21 @@ sub print_msvs_productdir()
sub print_csc_compiler_dir()
{
my $csc_exe =
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v4/Client/InstallPath") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v3.5/InstallPath") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot") . "v2.0.50727";
print cygpath ($csc_exe, 'w', $output_format);
my $csc_exe;
my $ver = find_msvc();
if ($ver->{'ver'} == "9.0") {
# We need to compile C# with the 3.5 or 2.0 compiler in order
# for the assemblies to be loadable by managed C++ code
# compiled with MSVC 2008.
$csc_exe =
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v3.5/InstallPath") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot") . "v2.0.50727";
} else {
# Is it enough to look for the 4.0 compiler?
$csc_exe =
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v4/Client/InstallPath");
}
print cygpath ($csc_exe, 'w', $output_format);
}
sub print_dotnetsdk_dir()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment