Handle libraries in directories with spaces in them.

Gevik Babakhani

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 5c47b66cb2aba0cfbb9c6812e49837ce02a3659d..4e8795c79eaa5656fd510e214d20379781af37aa 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -66,7 +66,9 @@ sub mkvcbuild
     $postgres->AddFiles('src\backend\bootstrap','bootscanner.l','bootparse.y');
     $postgres->AddFiles('src\backend\utils\misc','guc-file.l');
     $postgres->AddDefine('BUILDING_DLL');
-    $postgres->AddLibrary('wsock32.lib ws2_32.lib secur32.lib');
+    $postgres->AddLibrary('wsock32.lib');
+    $postgres->AddLibrary('ws2_32.lib');
+    $postgres->AddLibrary('secur32.lib');
     $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
     $postgres->FullExportDLL('postgres.lib');
 
@@ -179,7 +181,8 @@ sub mkvcbuild
     my $initdb = AddSimpleFrontend('initdb');
     $initdb->AddIncludeDir('src\interfaces\libpq');
     $initdb->AddDefine('FRONTEND');
-    $initdb->AddLibrary('wsock32.lib ws2_32.lib');
+    $initdb->AddLibrary('wsock32.lib');
+    $initdb->AddLibrary('ws2_32.lib');
 
     my $pgconfig = AddSimpleFrontend('pg_config');
 

diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
index e39505884bff1ec0f1c7d72a2890cac9aef0d36c..14ae7a8052f3c7406b0381096a3c97d04f4b8245 100644 (file)
--- a/src/tools/msvc/Project.pm
+++ b/src/tools/msvc/Project.pm
@@ -123,6 +123,11 @@ sub AddReference
 sub AddLibrary
 {
     my ($self, $lib, $dbgsuffix) = @_;
+    
+    if ($lib =~ m/\s/)
+    {
+       $lib = '"' . $lib . """;
+    }
 
     push @{$self->{libraries}}, $lib;
     if ($dbgsuffix)