Skip to content

Commit eddf810

Browse files
jeffhostetlerGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
vcxproj.pm: fix AdditionalDependencies
Add .LIBs for zlib and openssl to <AdditionalDependencies> to help linker when building with VS2017. This closes #1234 Note: this patch still leaves a couple of TODOs: - It should be possible to add GEN.DEPS\lib to <AdditionalLibraryDependencies> and then just set <AdditionalDependencies> to the library basenames. - Likewise, you should be able to copy GEN.DEPS\bin\*.dll to the destination directory rather than using the full paths in the $afterTargets lines. (This is in line with items in <AdditionalIncludeDirectories> referencing GEN.DEPS\include.) Signed-off-by: Jeff Hostetler <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 57ad1b4 commit eddf810

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

contrib/buildsystems/Generators/Vcxproj.pm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,13 @@ sub createProject {
163163
} elsif ($needsCurl && $1 eq 'expat') {
164164
# libexpat is only available targeting v100 and v110
165165
$libs .= ";$rel_dir\\compat\\vcbuild\\GEN.PKGS\\$1.$2\\build\\native\\lib\\v110\\\$(Platform)\\Release\\dynamic\\utf8\\libexpat.lib";
166+
} elsif ($1 eq 'zlib') {
167+
# zlib
168+
$libs .= ";$rel_dir\\compat\\vcbuild\\GEN.PKGS\\$1.v140.windesktop.msvcstl.dyn.rt-dyn.$2\\lib\\native\\v140\\windesktop\\msvcstl\\dyn\\rt-dyn\\x64\\RelWithDebInfo\\zlib.lib";
169+
} elsif ($1 eq 'openssl') {
170+
# openssl
171+
$libs .= ";$rel_dir\\compat\\vcbuild\\GEN.PKGS\\$1.v140.windesktop.msvcstl.dyn.rt-dyn.x64.$2\\lib\\native\\v140\\windesktop\\msvcstl\\dyn\\rt-dyn\\x64\\release\\libeay32.lib";
172+
$libs .= ";$rel_dir\\compat\\vcbuild\\GEN.PKGS\\$1.v140.windesktop.msvcstl.dyn.rt-dyn.x64.$2\\lib\\native\\v140\\windesktop\\msvcstl\\dyn\\rt-dyn\\x64\\release\\ssleay32.lib";
166173
}
167174
next if ($1 =~ /^(zlib$|openssl(?!.*(x64|x86)$))/);
168175
my $targetsFile = "$rel_dir\\compat\\vcbuild\\GEN.PKGS\\$1.$2\\build\\native\\$1.targets";

0 commit comments

Comments
 (0)