diff options
| author | Andrew Dunstan | 2010-03-03 03:29:37 +0000 |
|---|---|---|
| committer | Andrew Dunstan | 2010-03-03 03:29:37 +0000 |
| commit | 3a8497892c69352e48f5f26e2a2299ee5a7934a5 (patch) | |
| tree | f30971c5c587a595bdba06e50313c437abc108ed | |
| parent | 8b420770b3457d97e608442603f548573afd6bdf (diff) | |
Make iconv work like other optional libraries for MSVC.
| -rw-r--r-- | src/tools/msvc/Solution.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index bd5c4882e1..74c161b043 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -3,7 +3,7 @@ package Solution; # # Package that encapsulates a Visual C++ solution file generation # -# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.55 2010/03/02 22:02:31 adunstan Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.56 2010/03/03 03:29:37 adunstan Exp $ # use Carp; use strict; @@ -413,10 +413,14 @@ sub AddProject $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\comerr32.lib'); $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\gssapi32.lib'); } + if ($self->{options}->{iconv}) + { + $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); + $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); + } if ($self->{options}->{xml}) { $proj->AddIncludeDir($self->{options}->{xml} . '\include'); - $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); } if ($self->{options}->{xslt}) |