diff options
author | Magnus Hagander | 2009-04-07 19:35:57 +0000 |
---|---|---|
committer | Magnus Hagander | 2009-04-07 19:35:57 +0000 |
commit | a0ce8c12c5f558babd175c05de40f3c1e715c4f4 (patch) | |
tree | 39aa4b3fd95611eb0d50fe8b1f39e0a080ca3605 | |
parent | 72da97884f1e6d87846a3ff0f9bccdc0f27a6461 (diff) |
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
-rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 74978996c4..4754f16b27 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -104,7 +104,14 @@ sub mkvcbuild } } $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}) @@ -122,7 +129,14 @@ sub mkvcbuild my $pltcl = $solution->AddProject('pltcl','dll','PLs','src\pl\tcl'); $pltcl->AddIncludeDir($solution->{options}->{tcl} . '\include'); $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'); |