Commit3a84978

committed

Make iconv work like other optional libraries for MSVC.

1 parent8b42077 commit3a84978Copy full SHA for 3a84978

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.55 2010/03/02 22:02:31 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.56 2010/03/03 03:29:37 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -413,10 +413,14 @@ sub AddProject`
`413`	`413`	`$proj->AddLibrary($self->{options}->{krb5} .'\lib\i386\comerr32.lib');`
`414`	`414`	`$proj->AddLibrary($self->{options}->{krb5} .'\lib\i386\gssapi32.lib');`
`415`	`415`	`}`
	`416`	`+if ($self->{options}->{iconv})`
	`417`	`+ {`
	`418`	`+$proj->AddIncludeDir($self->{options}->{iconv} .'\include');`
	`419`	`+$proj->AddLibrary($self->{options}->{iconv} .'\lib\iconv.lib');`
	`420`	`+}`
`416`	`421`	`if ($self->{options}->{xml})`
`417`	`422`	`{`
`418`	`423`	`$proj->AddIncludeDir($self->{options}->{xml} .'\include');`
`419`		`-$proj->AddIncludeDir($self->{options}->{iconv} .'\include');`
`420`	`424`	`$proj->AddLibrary($self->{options}->{xml} .'\lib\libxml2.lib');`
`421`	`425`	`}`
`422`	`426`	`if ($self->{options}->{xslt})`

Comments

(0)