Skip to content

Commit e07d717

Browse files
committed
fixup! contrib/buildsystems: support modern Visual Studio project definitions
Turns out that the <AdditionalLibraryDirectories> directive is unnecessary, as we specify our dependencies with full path anyway. It is even detrimental, as the flags we get from the current `make MSVC=1` dry-run include architecture-specific libraries, which make 32-bit builds fail when the .vcxproj files were generated in a 64-bit setup. These 32-bit builds can be triggered e.g. by calling msbuild /p:Configuration=Release;Platform=x86 git.sln in an MSBuild Command Prompt. This fixes #1104. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 59b761d commit e07d717

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

contrib/buildsystems/Generators/Vcxproj.pm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ sub createProject {
131131
if (!$static_library) {
132132
$libs = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib|libcurl\.lib|libeay32\.lib|libiconv\.lib|ssleay32\.lib|zlib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
133133
}
134-
my $ldirs = join(";", map { /^-L(?!TCG)(.*)/ ? (File::Spec->file_name_is_absolute($1) ? $1 : "$rel_dir\\$1") : () } @{$$build_structure{"$prefix${name}_LFLAGS"}});
135134

136135
$defines =~ s/-D//g;
137136
$defines =~ s/\"/&quot;/g;
@@ -245,7 +244,6 @@ sub createProject {
245244
</Lib>
246245
<Link>
247246
<AdditionalDependencies>$libs;\$(AdditionalDependencies)</AdditionalDependencies>
248-
<AdditionalLibraryDirectories>$ldirs</AdditionalLibraryDirectories>
249247
<AdditionalOptions>invalidcontinue.obj %(AdditionalOptions)</AdditionalOptions>
250248
<ManifestFile>$cdup\\compat\\win32\\git.manifest</ManifestFile>
251249
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)