diff options
Diffstat (limited to 'src/tools/msvc/Mkvcbuild.pm')
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 71450f47739..d3220696c07 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -524,7 +524,7 @@ sub mkvcbuild $mf = Project::read_file('src\backend\utils\mb\conversion_procs\Makefile'); - $mf =~ s{\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; $mf =~ m{SUBDIRS\s*=\s*(.*)$}m || die 'Could not match in conversion makefile' . "\n"; foreach my $sub (split /\s+/, $1) @@ -536,7 +536,7 @@ sub mkvcbuild } $mf = Project::read_file('src\bin\scripts\Makefile'); - $mf =~ s{\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; $mf =~ m{PROGRAMS\s*=\s*(.*)$}m || die 'Could not match in bin\scripts\Makefile' . "\n"; foreach my $prg (split /\s+/, $1) @@ -674,7 +674,7 @@ sub GenerateContribSqlFiles { my $n = shift; my $mf = shift; - $mf =~ s{\\\s*[\r\n]+}{}mg; + $mf =~ s{\\\r?\n}{}g; if ($mf =~ /^DATA_built\s*=\s*(.*)$/mg) { my $l = $1; |