database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-08 07:21:33 +03:00
Code

Switch order of libpgport and libpgcommon in MSVC build as well

Browse Source
This commit is contained in:
Peter Eisentraut 2013-10-18 08:15:20 -04:00
parent ea91a6be89
commit 3c093b4ad2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/msvc/Mkvcbuild.pm
View File

@ -319,7 +319,7 @@ sub mkvcbuild
$ecpg->AddDefine('MINOR_VERSION=10'); $ecpg->AddDefine('MINOR_VERSION=10');
$ecpg->AddDefine('PATCHLEVEL=0'); $ecpg->AddDefine('PATCHLEVEL=0');
$ecpg->AddDefine('ECPG_COMPILE'); $ecpg->AddDefine('ECPG_COMPILE');
$ecpg->AddReference($libpgport, $libpgcommon); $ecpg->AddReference($libpgcommon, $libpgport);
my $pgregress_ecpg = my $pgregress_ecpg =
$solution->AddProject('pg_regress_ecpg', 'exe', 'misc'); $solution->AddProject('pg_regress_ecpg', 'exe', 'misc');
@ -329,7 +329,7 @@ sub mkvcbuild
$pgregress_ecpg->AddIncludeDir('src\test\regress'); $pgregress_ecpg->AddIncludeDir('src\test\regress');
$pgregress_ecpg->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $pgregress_ecpg->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$pgregress_ecpg->AddDefine('FRONTEND'); $pgregress_ecpg->AddDefine('FRONTEND');
$pgregress_ecpg->AddReference($libpgport, $libpgcommon); $pgregress_ecpg->AddReference($libpgcommon, $libpgport);
my $isolation_tester = my $isolation_tester =
$solution->AddProject('isolationtester', 'exe', 'misc'); $solution->AddProject('isolationtester', 'exe', 'misc');
@ -354,7 +354,7 @@ sub mkvcbuild
$pgregress_isolation->AddIncludeDir('src\test\regress'); $pgregress_isolation->AddIncludeDir('src\test\regress');
$pgregress_isolation->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $pgregress_isolation->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$pgregress_isolation->AddDefine('FRONTEND'); $pgregress_isolation->AddDefine('FRONTEND');
$pgregress_isolation->AddReference($libpgport, $libpgcommon); $pgregress_isolation->AddReference($libpgcommon, $libpgport);
# src/bin # src/bin
my $initdb = AddSimpleFrontend('initdb'); my $initdb = AddSimpleFrontend('initdb');
@ -432,7 +432,7 @@ sub mkvcbuild
my $zic = $solution->AddProject('zic', 'exe', 'utils'); my $zic = $solution->AddProject('zic', 'exe', 'utils');
$zic->AddFiles('src\timezone', 'zic.c', 'ialloc.c', 'scheck.c', $zic->AddFiles('src\timezone', 'zic.c', 'ialloc.c', 'scheck.c',
'localtime.c'); 'localtime.c');
$zic->AddReference($libpgport, $libpgcommon); $zic->AddReference($libpgcommon, $libpgport);
if ($solution->{options}->{xml}) if ($solution->{options}->{xml})
{ {
@ -572,7 +572,7 @@ sub mkvcbuild
$proj->AddIncludeDir('src\interfaces\libpq'); $proj->AddIncludeDir('src\interfaces\libpq');
$proj->AddIncludeDir('src\bin\pg_dump'); $proj->AddIncludeDir('src\bin\pg_dump');
$proj->AddIncludeDir('src\bin\psql'); $proj->AddIncludeDir('src\bin\psql');
$proj->AddReference($libpq, $libpgport, $libpgcommon); $proj->AddReference($libpq, $libpgcommon, $libpgport);
$proj->AddResourceFile('src\bin\scripts', 'PostgreSQL Utility'); $proj->AddResourceFile('src\bin\scripts', 'PostgreSQL Utility');
$proj->AddLibrary('ws2_32.lib'); $proj->AddLibrary('ws2_32.lib');
} }
@ -587,7 +587,7 @@ sub mkvcbuild
$pgregress->AddFile('src\test\regress\pg_regress_main.c'); $pgregress->AddFile('src\test\regress\pg_regress_main.c');
$pgregress->AddIncludeDir('src\port'); $pgregress->AddIncludeDir('src\port');
$pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$pgregress->AddReference($libpgport, $libpgcommon); $pgregress->AddReference($libpgcommon, $libpgport);
# fix up pg_xlogdump once it's been set up # fix up pg_xlogdump once it's been set up
# files symlinked on Unix are copied on windows # files symlinked on Unix are copied on windows
@ -621,7 +621,7 @@ sub AddSimpleFrontend
my $p = $solution->AddProject($n, 'exe', 'bin'); my $p = $solution->AddProject($n, 'exe', 'bin');
$p->AddDir('src\bin\\' . $n); $p->AddDir('src\bin\\' . $n);
$p->AddReference($libpgport, $libpgcommon); $p->AddReference($libpgcommon, $libpgport);
if ($uselibpq) if ($uselibpq)
{ {
$p->AddIncludeDir('src\interfaces\libpq'); $p->AddIncludeDir('src\interfaces\libpq');