diff options
Diffstat (limited to 'src/tools/msvc/Mkvcbuild.pm')
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 85b1b841ff7..3d564f83b87 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -3,7 +3,7 @@ package Mkvcbuild; # # Package that generates build files for msvc build # -# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25 2008/02/05 14:17:23 mha Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25.2.1 2008/02/28 12:18:03 mha Exp $ # use Carp; use Win32; @@ -31,7 +31,7 @@ my $contrib_extrasource = { 'cube' => ['cubescan.l','cubeparse.y'], 'seg' => ['segscan.l','segparse.y'] }; -my @contrib_excludes = ('pgcrypto','uuid-ossp'); +my @contrib_excludes = ('pgcrypto'); sub mkvcbuild { @@ -247,6 +247,16 @@ sub mkvcbuild push @contrib_excludes,'sslinfo'; } + if ($solution->{options}->{uuid}) + { + $contrib_extraincludes->{'uuid-ossp'} = [ $solution->{options}->{uuid} . '\include' ]; + $contrib_extralibs->{'uuid-ossp'} = [ $solution->{options}->{uuid} . '\lib\uuid.lib' ]; + } + else + { + push @contrib_excludes,'uuid-ossp'; + } + # Pgcrypto makefile too complex to parse.... my $pgcrypto = $solution->AddProject('pgcrypto','dll','crypto'); $pgcrypto->AddFiles( |