X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=contrib%2Fbuildsystems%2FGenerators%2FVcxproj.pm;h=5c666f9ac03b01f968d8fb36e064a47c6fb50a4a;hb=c555caab7a303109d6c712d757bc4621a3ee0bbd;hp=576ccabe1dbda06b90ee70a1882ef726315a2182;hpb=8ce8a63b46298501c9afebfea28ed3339a9104b7;p=thirdparty%2Fgit.git
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index 576ccabe1d..5c666f9ac0 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -79,7 +79,8 @@ sub createProject {
if (!$static_library) {
$libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
$libs_debug = $libs_release;
- $libs_debug =~ s/zlib\.lib/zlibd\.lib/;
+ $libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
+ $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
}
$defines =~ s/-D//g;
@@ -119,13 +120,13 @@ sub createProject {
x86-windows
x64-windows
$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)
- \$(VCPKGArchDirectory)\\debug\\bin
- \$(VCPKGArchDirectory)\\debug\\lib
- \$(VCPKGArchDirectory)\\bin
- \$(VCPKGArchDirectory)\\lib
+ \$(VCPKGArchDirectory)\\debug\\bin
+ \$(VCPKGArchDirectory)\\debug\\lib
+ \$(VCPKGArchDirectory)\\bin
+ \$(VCPKGArchDirectory)\\lib
\$(VCPKGArchDirectory)\\include
- $libs_debug
- $libs_release
+ $libs_debug
+ $libs_release
@@ -277,6 +278,9 @@ EOM
if ($target eq 'git') {
print F " \n";
}
+ if ($target eq 'git-remote-http') {
+ print F " \n";
+ }
print F << "EOM";
EOM