fixes for MSVC 2013 build of libicu and perl 5.22

vbwagner · vbwagner · commit 340b392a44b3 · 2016-03-24T10:10:47.000+03:00
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -577,8 +577,8 @@ sub mkvcbuild
 		}
 		$plperl->AddReference($postgres);
 		my @perl_libs =
-		  grep { /perl\d+.lib$/ }
-		  glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
+		  grep { /perl\d+\.(lib|a)$/ }
+		  glob($solution->{options}->{perl} . '\lib\CORE\*.*');
 		if (@perl_libs == 1)
 		{
 			$plperl->AddLibrary($perl_libs[0]);
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -535,7 +535,7 @@ sub AddProject
 	if ($self->{options}->{icu})
 	{
 		my $libdir = $self->{options}->{icu}.'\lib';
-		$libdir .= '\lib64' if $self->{platform} eq 'x64';
+		$libdir .= '\lib64' if $self->{platform} eq 'x64' and -d $libdir.'\lib64';
 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
 		$proj->AddLibrary($libdir.'\icuin.lib');
 		$proj->AddLibrary($libdir.'\icuuc.lib');

Original file line number	Diff line number	Diff line change
`@@ -577,8 +577,8 @@ sub mkvcbuild`
`577`	`577`	`}`
`578`	`578`	`$plperl->AddReference($postgres);`
`579`	`579`	`my @perl_libs =`
`580`		`- grep { /perl\d+.lib$/ }`
`581`		`- glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');`
	`580`	`+ grep { /perl\d+\.(lib\|a)$/ }`
	`581`	`+ glob($solution->{options}->{perl} . '\lib\CORE\.');`
`582`	`582`	`if (@perl_libs == 1)`
`583`	`583`	`{`
`584`	`584`	`$plperl->AddLibrary($perl_libs[0]);`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ sub AddProject`
`535`	`535`	`if ($self->{options}->{icu})`
`536`	`536`	`{`
`537`	`537`	`my $libdir = $self->{options}->{icu}.'\lib';`
`538`		`- $libdir .= '\lib64' if $self->{platform} eq 'x64';`
	`538`	`+ $libdir .= '\lib64' if $self->{platform} eq 'x64' and -d $libdir.'\lib64';`
`539`	`539`	`$proj->AddIncludeDir($self->{options}->{icu} . '\include');`
`540`	`540`	`$proj->AddLibrary($libdir.'\icuin.lib');`
`541`	`541`	`$proj->AddLibrary($libdir.'\icuuc.lib');`