mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 10:27:56 +08:00
01a065a970
* [libpq] Update to 12.9 * [libpq] Use VCPKG_OSX_SYSROOT if set otherwise configure set the default sysroot in addition, ignoring the sysroot set by vcpkg_configure_cmake. * [libpq] remove comment only chunks from patches * [libpq] update version registry
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
|
|
index 51711c2bf..d33fdc3b0 100644
|
|
--- a/src/tools/msvc/Solution.pm
|
|
+++ b/src/tools/msvc/Solution.pm
|
|
@@ -658,7 +658,7 @@ sub AddProject
|
|
if ($self->{options}->{zlib})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
|
|
- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
|
|
+ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib');
|
|
}
|
|
if ($self->{options}->{openssl})
|
|
{
|
|
@@ -724,7 +724,7 @@ sub AddProject
|
|
if ($self->{options}->{nls})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{nls} . '\include');
|
|
- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
|
|
+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib');
|
|
}
|
|
if ($self->{options}->{gss})
|
|
{
|
|
@@ -765,9 +765,9 @@ sub AddProject
|
|
}
|
|
else
|
|
{
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
|
|
}
|
|
}
|
|
if ($self->{options}->{xml})
|