Commit03e4dc9

committed

Handle libraries in directories with spaces in them.

Gevik Babakhani

1 parent701cd5a commit03e4dc9Copy full SHA for 03e4dc9

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.24 2007/11/13 22:49:47 tgl Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25 2008/02/05 14:17:23 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -66,7 +66,9 @@ sub mkvcbuild`
`66`	`66`	`$postgres->AddFiles('src\backend\bootstrap','bootscanner.l','bootparse.y');`
`67`	`67`	`$postgres->AddFiles('src\backend\utils\misc','guc-file.l');`
`68`	`68`	`$postgres->AddDefine('BUILDING_DLL');`
`69`		`-$postgres->AddLibrary('wsock32.lib ws2_32.lib secur32.lib');`
	`69`	`+$postgres->AddLibrary('wsock32.lib');`
	`70`	`+$postgres->AddLibrary('ws2_32.lib');`
	`71`	`+$postgres->AddLibrary('secur32.lib');`
`70`	`72`	`$postgres->AddLibrary('wldap32.lib')if ($solution->{options}->{ldap});`
`71`	`73`	`$postgres->FullExportDLL('postgres.lib');`
`72`	`74`
`@@ -179,7 +181,8 @@ sub mkvcbuild`
`179`	`181`	`my$initdb = AddSimpleFrontend('initdb');`
`180`	`182`	`$initdb->AddIncludeDir('src\interfaces\libpq');`
`181`	`183`	`$initdb->AddDefine('FRONTEND');`
`182`		`-$initdb->AddLibrary('wsock32.lib ws2_32.lib');`
	`184`	`+$initdb->AddLibrary('wsock32.lib');`
	`185`	`+$initdb->AddLibrary('ws2_32.lib');`
`183`	`186`
`184`	`187`	`my$pgconfig = AddSimpleFrontend('pg_config');`
`185`	`188`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Project;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ project file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.15 2007/12/11 14:34:43 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.16 2008/02/05 14:17:23 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -123,6 +123,11 @@ sub AddReference`
`123`	`123`	`subAddLibrary`
`124`	`124`	`{`
`125`	`125`	`my ($self,$lib,$dbgsuffix) =@_;`
	`126`	`+`
	`127`	`+if ($lib =~m/\s/)`
	`128`	`+ {`
	`129`	`+$lib ='"' .$lib .""";`
	`130`	`+ }`
`126`	`131`
`127`	`132`	`push @{$self->{libraries}},$lib;`
`128`	`133`	`if ($dbgsuffix)`

Comments

(0)