@@ -9142,16 +9142,24 @@ index b99fb13..582e5d6 100644
91429142 -- Test ORDER BY options
91439143 --
91449144
9145- diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
9146- index 21faa58..d104dbc 100644
9147- --- a/src/tools/msvc/Mkvcbuild.pm
9148- +++ b/src/tools/msvc/Mkvcbuild.pm
9145+ diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm.new
9146+ index 21faa58..3aabd57 100644
9147+ --- a/postgresql-9.5.1/src/tools/msvc/Mkvcbuild.pm
9148+ +++ b/postgresql-9.5.1/src/tools/msvc/Mkvcbuild.pm.new
9149+ @@ -33,7 +33,7 @@ my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
9150+ my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo');
9151+ my @contrib_uselibpgport = ('oid2name', 'pg_standby', 'vacuumlo');
9152+ my @contrib_uselibpgcommon = ('oid2name', 'pg_standby', 'vacuumlo');
9153+ -my $contrib_extralibs = undef;
9154+ +my $contrib_extralibs = {'mchar' => ['icuin.lib', 'icuuc.lib']};
9155+ my $contrib_extraincludes =
9156+ { 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] };
9157+ my $contrib_extrasource = {
91499158@@ -58,6 +58,7 @@ my $frontend_extralibs = {
9150- 'initdb' => ['ws2_32.lib'],
9151- 'pg_restore' => ['ws2_32.lib'],
9152- 'pgbench' => ['ws2_32.lib'],
9153- +'mchar' => ['icuin.lib', 'icuuc.lib'],
9154- 'psql' => ['ws2_32.lib'] };
9155- my $contrib_extralibs = { 'pgbench' => ['wsock32.lib'], 'mchar' => ['icuin.lib', 'icuuc.lib'] };
9159+ 'initdb' => ['ws2_32.lib'],
9160+ 'pg_restore' => ['ws2_32.lib'],
9161+ 'pgbench' => ['ws2_32.lib'],
9162+ + 'mchar' => ['icuin.lib', 'icuuc.lib'],
9163+ 'psql' => ['ws2_32.lib'] };
91569164 my $frontend_extraincludes = {
9157- 'initdb' => ['src/timezone'],
9165+ 'initdb' => ['src/timezone'],