Skip to content

P
Postgres FD Implementation
Commit 3a849789 authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files
Options

Make iconv work like other optional libraries for MSVC.

parent 8b420770
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/tools/msvc/Solution.pm
View file @ 3a849789
...@@ -3,7 +3,7 @@ package Solution; ...@@ -3,7 +3,7 @@ package Solution;
# #
# Package that encapsulates a Visual C++ solution file generation # 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 Carp;
use strict; use strict;
...@@ -413,10 +413,14 @@ sub AddProject ...@@ -413,10 +413,14 @@ sub AddProject
$proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\comerr32.lib'); $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\comerr32.lib');
$proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\gssapi32.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}) if ($self->{options}->{xml})
{ {
$proj->AddIncludeDir($self->{options}->{xml} . '\include'); $proj->AddIncludeDir($self->{options}->{xml} . '\include');
$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
} }
if ($self->{options}->{xslt}) if ($self->{options}->{xslt})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment