]> granicus.if.org Git - postgresql/commitdiff
Best-guess attempt at fixing MSVC build for 68ab8e8ba4a471d9.
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 20 Mar 2016 21:51:54 +0000 (17:51 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 20 Mar 2016 21:51:54 +0000 (17:51 -0400)
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

index 12f3bc6e6b01977ee862ced81f9681b03106eb0e..3d929e6a09a58a78384c928856ce25c7b69ceba7 100644 (file)
@@ -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');