@@ -3,7 +3,7 @@ package Mkvcbuild;
33#
44# Package that generates build files for msvc build
55#
6- # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.28 2008/05/09 16:01:05 adunstan Exp $
6+ # $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.29 2008/05/10 15:30:11 adunstan Exp $
77#
88use Carp;
99use Win32;
@@ -414,8 +414,10 @@ sub AddContrib
414414$mf2 =~s {\\\s *[\r\n ]+} {} mg
415415$mf2 =~/ ^SUBOBJS\s *=\s *(.*)$ /gm
416416 || croak" Could not find objects in MODULE_big for$n , subdir$d \n "
417- foreach my $o (split /\s +/,$1 )
418- {
417+ $objs =$1 ;
418+ while ($objs =~/ \b ([\w -]+\. o)\b /g
419+ {
420+ my $o =$1 ;
419421$o =~s /\. o$/ .c/
420422$proj -> AddFile(' contrib\\ ' $n .' \\ ' $d .' \\ ' $o );
421423 }
@@ -437,8 +439,10 @@ sub AddContrib
437439 {
438440my $proj =$solution -> AddProject($1 ,' exe' ' contrib'
439441$mf =~/ ^OBJS\s *=\s *(.*)$ /gm " Could not find objects in MODULE_big for$n \n "
440- foreach my $o (split /\s +/,$1 )
442+ my $objs =$1 ;
443+ while ($objs =~/ \b ([\w -]+\. o)\b /g
441444 {
445+ my $o =$1 ;
442446$o =~s /\. o$/ .c/
443447$proj -> AddFile(' contrib\\ ' $n .' \\ ' $o );
444448 }