rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle libraries in directories with spaces in them. 

Gevik Babakhani
This commit is contained in:
Magnus Hagander 2008-02-05 14:17:23 +00:00
parent 701cd5af45
commit 03e4dc9ef2
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/msvc/Mkvcbuild.pm
View File

@ -3,7 +3,7 @@ package Mkvcbuild;
# #
# Package that generates build files for msvc build # Package that generates build files for msvc build
# #
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.24 2007/11/13 22:49:47 tgl Exp $ # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25 2008/02/05 14:17:23 mha Exp $
# #
use Carp; use Carp;
use Win32; use Win32;
@ -66,7 +66,9 @@ sub mkvcbuild
$postgres->AddFiles('src\backend\bootstrap','bootscanner.l','bootparse.y'); $postgres->AddFiles('src\backend\bootstrap','bootscanner.l','bootparse.y');
$postgres->AddFiles('src\backend\utils\misc','guc-file.l'); $postgres->AddFiles('src\backend\utils\misc','guc-file.l');
$postgres->AddDefine('BUILDING_DLL'); $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->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
$postgres->FullExportDLL('postgres.lib'); $postgres->FullExportDLL('postgres.lib');
@ -179,7 +181,8 @@ sub mkvcbuild
my $initdb = AddSimpleFrontend('initdb'); my $initdb = AddSimpleFrontend('initdb');
$initdb->AddIncludeDir('src\interfaces\libpq'); $initdb->AddIncludeDir('src\interfaces\libpq');
$initdb->AddDefine('FRONTEND'); $initdb->AddDefine('FRONTEND');
$initdb->AddLibrary('wsock32.lib ws2_32.lib'); $initdb->AddLibrary('wsock32.lib');
$initdb->AddLibrary('ws2_32.lib');
my $pgconfig = AddSimpleFrontend('pg_config'); my $pgconfig = AddSimpleFrontend('pg_config');

7
src/tools/msvc/Project.pm
View File

@ -3,7 +3,7 @@ package Project;
# #
# Package that encapsulates a Visual C++ project file generation # Package that encapsulates a Visual C++ project file generation
# #
# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.15 2007/12/11 14:34:43 mha Exp $ # $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.16 2008/02/05 14:17:23 mha Exp $
# #
use Carp; use Carp;
use strict; use strict;
@ -123,6 +123,11 @@ sub AddReference
sub AddLibrary sub AddLibrary
{ {
my ($self, $lib, $dbgsuffix) = @_; my ($self, $lib, $dbgsuffix) = @_;
if ($lib =~ m/\s/)
{
$lib = '"' . $lib . """;
}
push @{$self->{libraries}}, $lib; push @{$self->{libraries}}, $lib;
if ($dbgsuffix) if ($dbgsuffix)