From 6f1f34c92b11593ec62ff3e12781eb96dc911821 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 20 Mar 2016 17:51:54 -0400 Subject: [PATCH] Best-guess attempt at fixing MSVC build for 68ab8e8ba4a471d9. pgbench now needs to use src/bin/psql/psqlscan.l, but it's not very clear how to fit that into the MSVC build system. If this doesn't work I'm going to need some help from somebody who actually understands those scripts ... --- src/tools/msvc/Mkvcbuild.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 12f3bc6e6b..3d929e6a09 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -62,11 +62,13 @@ my $frontend_extralibs = { 'psql' => ['ws2_32.lib'] }; my $frontend_extraincludes = { 'initdb' => ['src/timezone'], - 'psql' => [ 'src/bin/pg_dump', 'src/backend' ] }; + 'psql' => [ 'src/bin/pg_dump', 'src/backend' ], + 'pgbench' => [ 'src/bin/psql' ] }; my $frontend_extrasource = { 'psql' => ['src/bin/psql/psqlscan.l', 'src/bin/psql/psqlscanslash.l'], 'pgbench' => - [ 'src/bin/pgbench/exprscan.l', 'src/bin/pgbench/exprparse.y' ], }; + [ 'src/bin/pgbench/exprscan.l', 'src/bin/pgbench/exprparse.y', + 'src/bin/psql/psqlscan.l' ] }; my @frontend_excludes = ( 'pgevent', 'pg_basebackup', 'pg_rewind', 'pg_dump', 'pg_xlogdump', 'scripts'); -- 2.40.0