diff --git a/config.mak.uname b/config.mak.uname index ac904c8a5ce1d0..bfb75d678e845a 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -746,8 +746,8 @@ vcxproj: git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN) # Add Perl module - $(MAKE) -C perl - git add -f perl/blib/lib + $(MAKE) $(LIB_PERL_GEN) + git add -f perl/build # Add bin-wrappers, for testing rm -rf bin-wrappers/ diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm index ea5cf07f231e0f..50d3c625c17b49 100644 --- a/contrib/buildsystems/Generators/Vcxproj.pm +++ b/contrib/buildsystems/Generators/Vcxproj.pm @@ -74,8 +74,8 @@ sub createProject { $cflags =~ s//>/g; - my $libs_release = ''; - my $libs_debug = ''; + my $libs_release = "\n "; + my $libs_debug = "\n "; 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; @@ -227,7 +227,7 @@ EOM print F << "EOM"; EOM - if (!$static_library || $target eq 'vcs-svn') { + if (!$static_library || $target =~ 'vcs-svn') { my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"}; my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};