Commit 2762e555 authored by Magnus Hagander's avatar Magnus Hagander

Support Perl 5.10 and TCL 8.5 in MSVC builds.

We should probably have a better way to do this (meaning
something not hardcoded) eventually, but this fixes the
problem for 8.4.

Dave Page
parent b89ab7e0
...@@ -3,7 +3,7 @@ package Mkvcbuild; ...@@ -3,7 +3,7 @@ package Mkvcbuild;
# #
# Package that generates build files for msvc build # Package that generates build files for msvc build
# #
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.38 2009/03/08 19:13:38 mha Exp $ # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $
# #
use Carp; use Carp;
use Win32; use Win32;
...@@ -104,8 +104,15 @@ sub mkvcbuild ...@@ -104,8 +104,15 @@ sub mkvcbuild
} }
} }
$plperl->AddReference($postgres); $plperl->AddReference($postgres);
if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')
{
$plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl510.lib');
}
else
{
$plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib'); $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
} }
}
if ($solution->{options}->{python}) if ($solution->{options}->{python})
{ {
...@@ -122,8 +129,15 @@ sub mkvcbuild ...@@ -122,8 +129,15 @@ sub mkvcbuild
my $pltcl = $solution->AddProject('pltcl','dll','PLs','src\pl\tcl'); my $pltcl = $solution->AddProject('pltcl','dll','PLs','src\pl\tcl');
$pltcl->AddIncludeDir($solution->{options}->{tcl} . '\include'); $pltcl->AddIncludeDir($solution->{options}->{tcl} . '\include');
$pltcl->AddReference($postgres); $pltcl->AddReference($postgres);
if (-e $solution->{options}->{tcl} . '\lib\tcl85.lib')
{
$pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl85.lib');
}
else
{
$pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib'); $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');
} }
}
$libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq'); $libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');
$libpq->AddDefine('FRONTEND'); $libpq->AddDefine('FRONTEND');
......
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