@@ -3,7 +3,7 @@ package Mkvcbuild;
33#
44# Package that generates build files for msvc build
55#
6- # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.38 2009/03/08 19:13:38 mha Exp $
6+ # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $
77#
88use Carp;
99use Win32;
@@ -104,7 +104,14 @@ sub mkvcbuild
104104 }
105105 }
106106$plperl -> AddReference($postgres );
107- $plperl -> AddLibrary($solution -> {options }-> {perl } .' \lib\CORE\perl58.lib' );
107+ if (-e $solution -> {options }-> {perl } .' \lib\CORE\perl510.lib' )
108+ {
109+ $plperl -> AddLibrary($solution -> {options }-> {perl } .' \lib\CORE\perl510.lib' );
110+ }
111+ else
112+ {
113+ $plperl -> AddLibrary($solution -> {options }-> {perl } .' \lib\CORE\perl58.lib' );
114+ }
108115 }
109116
110117if ($solution -> {options }-> {python })
@@ -122,7 +129,14 @@ sub mkvcbuild
122129my $pltcl =$solution -> AddProject(' pltcl' ,' dll' ,' PLs' ,' src\pl\tcl' );
123130$pltcl -> AddIncludeDir($solution -> {options }-> {tcl } .' \include' );
124131$pltcl -> AddReference($postgres );
125- $pltcl -> AddLibrary($solution -> {options }-> {tcl } .' \lib\tcl84.lib' );
132+ if (-e $solution -> {options }-> {tcl } .' \lib\tcl85.lib' )
133+ {
134+ $pltcl -> AddLibrary($solution -> {options }-> {tcl } .' \lib\tcl85.lib' );
135+ }
136+ else
137+ {
138+ $pltcl -> AddLibrary($solution -> {options }-> {tcl } .' \lib\tcl84.lib' );
139+ }
126140 }
127141
128142$libpq =$solution -> AddProject(' libpq' ,' dll' ,' interfaces' ,' src\interfaces\libpq' );