*** pgsql/src/tools/msvc/Mkvcbuild.pm	2010/05/13 13:40:03	1.55
--- pgsql/src/tools/msvc/Mkvcbuild.pm	2010/05/13 15:56:22	1.56
*************** package Mkvcbuild;
*** 3,9 ****
  #
  # Package that generates build files for msvc build
  #
! # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.54 2010/04/09 13:05:58 mha Exp $
  #
  use Carp;
  use Win32;
--- 3,9 ----
  #
  # Package that generates build files for msvc build
  #
! # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.55 2010/05/13 13:40:03 adunstan Exp $
  #
  use Carp;
  use Win32;
*************** sub AddContrib
*** 515,521 ****
      elsif ($mf =~ /^PROGRAM\s*=\s*(.*)$/mg)
      {
          my $proj = $solution->AddProject($1, 'exe', 'contrib');
!         $mf =~ /^OBJS\s*=\s*(.*)$/gm || croak "Could not find objects in MODULE_big for $n\n";
          my $objs = $1;
          while ($objs =~ /\b([\w-]+\.o)\b/g)
          {
--- 515,522 ----
      elsif ($mf =~ /^PROGRAM\s*=\s*(.*)$/mg)
      {
          my $proj = $solution->AddProject($1, 'exe', 'contrib');
!         $mf =~ s{\\\s*[\r\n]+}{}mg;
!         $mf =~ /^OBJS\s*=\s*(.*)$/gm || croak "Could not find objects in PROGRAM for $n\n";
          my $objs = $1;
          while ($objs =~ /\b([\w-]+\.o)\b/g)
          {