mirror of
https://github.com/postgres/postgres.git
synced 2025-05-11 05:41:32 +03:00
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
This commit is contained in:
parent
b89ab7e019
commit
2762e5555c
@ -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,7 +104,14 @@ sub mkvcbuild
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$plperl->AddReference($postgres);
|
$plperl->AddReference($postgres);
|
||||||
$plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
|
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');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($solution->{options}->{python})
|
if ($solution->{options}->{python})
|
||||||
@ -122,7 +129,14 @@ 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);
|
||||||
$pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');
|
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');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');
|
$libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user