2020-01-14 07:43:36 +08:00
|
|
|
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
|
|
|
|
|
@@ -650,7 +650,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'); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
if ($self->{options}->{openssl})
|
|
|
|
|
{
|
|
|
|
|
@@ -661,7 +661,7 @@ sub AddProject
|
|
|
|
|
# changed their library names from:
|
|
|
|
|
# - libeay to libcrypto
|
|
|
|
|
# - ssleay to libssl
|
|
|
|
|
- if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
|
|
|
|
|
+ if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
|
|
|
|
|
{
|
|
|
|
|
my $dbgsuffix;
|
|
|
|
|
my $libsslpath;
|
|
|
|
|
@@ -670,27 +670,27 @@ sub AddProject
|
|
|
|
|
# The format name of the libraries is slightly
|
|
|
|
|
# different between the Win32 and Win64 platform, so
|
|
|
|
|
# adapt.
|
|
|
|
|
- if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
|
|
|
|
|
+ if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
|
|
|
|
|
{
|
|
|
|
|
# Win32 here, with a debugging library set.
|
|
|
|
|
$dbgsuffix = 1;
|
|
|
|
|
- $libsslpath = '\lib\VC\libssl32.lib';
|
|
|
|
|
- $libcryptopath = '\lib\VC\libcrypto32.lib';
|
|
|
|
|
+ $libsslpath = '\lib\VC\libssl32.lib'; # This must be updated
|
|
|
|
|
+ $libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
|
|
|
|
|
}
|
|
|
|
|
- elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
|
|
|
|
|
+ elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
|
|
|
|
|
{
|
|
|
|
|
# Win64 here, with a debugging library set.
|
|
|
|
|
$dbgsuffix = 1;
|
|
|
|
|
- $libsslpath = '\lib\VC\libssl64.lib';
|
|
|
|
|
- $libcryptopath = '\lib\VC\libcrypto64.lib';
|
|
|
|
|
+ $libsslpath = '\lib\VC\libssl64.lib'; # This must be updated
|
|
|
|
|
+ $libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
# On both Win32 and Win64 the same library
|
|
|
|
|
# names are used without a debugging context.
|
|
|
|
|
$dbgsuffix = 0;
|
|
|
|
|
- $libsslpath = '\lib\libssl.lib';
|
|
|
|
|
- $libcryptopath = '\lib\libcrypto.lib';
|
|
|
|
|
+ $libsslpath = '\lib\libssl.lib'; # This must be updated
|
|
|
|
|
+ $libcryptopath = '\lib\libcrypto.lib'; # This must be updated
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
|
|
|
|
|
@@ -698,16 +698,16 @@ sub AddProject
|
|
|
|
|
$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
|
|
|
|
|
$dbgsuffix);
|
|
|
|
|
}
|
|
|
|
|
- else
|
|
|
|
|
+ else
|
|
|
|
|
{
|
|
|
|
|
# Choose which set of libraries to use depending on if
|
|
|
|
|
# debugging libraries are in place in the installer.
|
|
|
|
|
- if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
|
|
|
|
|
+ if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
|
|
|
|
|
{
|
|
|
|
|
$proj->AddLibrary(
|
|
|
|
|
- $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
|
|
|
|
|
+ $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
|
|
|
|
|
$proj->AddLibrary(
|
|
|
|
|
- $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
|
|
|
|
|
+ $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
@@ -715,60 +715,60 @@ sub AddProject
|
|
|
|
|
# to be here, so don't ask for it in last
|
|
|
|
|
# parameter.
|
|
|
|
|
$proj->AddLibrary(
|
|
|
|
|
- $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
|
|
|
|
|
+ $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); # This must be updated
|
|
|
|
|
$proj->AddLibrary(
|
|
|
|
|
- $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
|
|
|
|
|
+ $self->{options}->{openssl} . '\lib\libeay32.lib', 0); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ($self->{options}->{nls})
|
|
|
|
|
{
|
|
|
|
|
$proj->AddIncludeDir($self->{options}->{nls} . '\include');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
|
2020-11-20 04:33:04 +08:00
|
|
|
+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated
|
2020-01-14 07:43:36 +08:00
|
|
|
}
|
|
|
|
|
if ($self->{options}->{gss})
|
|
|
|
|
{
|
|
|
|
|
- $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
|
|
|
|
|
+ $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); # This must be updated
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
|
|
|
|
|
}
|
|
|
|
|
if ($self->{options}->{iconv})
|
|
|
|
|
{
|
|
|
|
|
$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
|
2020-11-20 04:33:04 +08:00
|
|
|
+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated
|
2020-01-14 07:43:36 +08:00
|
|
|
}
|
|
|
|
|
if ($self->{options}->{icu})
|
|
|
|
|
{
|
|
|
|
|
$proj->AddIncludeDir($self->{options}->{icu} . '\include');
|
|
|
|
|
if ($self->{platform} eq 'Win32')
|
|
|
|
|
{
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
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'); # This must be updated
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ($self->{options}->{xml})
|
|
|
|
|
{
|
|
|
|
|
$proj->AddIncludeDir($self->{options}->{xml} . '\include');
|
|
|
|
|
$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
if ($self->{options}->{xslt})
|
|
|
|
|
{
|
|
|
|
|
$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
if ($self->{options}->{uuid})
|
|
|
|
|
{
|
|
|
|
|
$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
|
|
|
|
|
- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
|
|
|
|
|
+ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # This must be updated
|
|
|
|
|
}
|
|
|
|
|
return $proj;
|
|
|
|
|
}
|
