Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2762e55

Browse files
committed
Support Perl 5.10 and TCL 8.5 in MSVC builds.
We should probably have a better way to do this (meaningsomething not hardcoded) eventually, but this fixes theproblem for 8.4.Dave Page
1 parentb89ab7e commit2762e55

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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
#
88
use Carp;
99
use 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

110117
if ($solution->{options}->{python})
@@ -122,7 +129,14 @@ sub mkvcbuild
122129
my$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');

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp