Commit340b392

committed

fixes for MSVC 2013 build of libicu and perl 5.22

1 parentdf4c38f commit340b392Copy full SHA for 340b392

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

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]);`

Lines changed: 1 addition & 1 deletion

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');`

Comments

(0)