|
| 1 | +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm |
| 2 | +index d7638b4..ccf1f76 100644 |
| 3 | +--- a/src/tools/msvc/MSBuildProject.pm |
| 4 | ++++ b/src/tools/msvc/MSBuildProject.pm |
| 5 | +@@ -345,6 +345,9 @@ EOF |
| 6 | + $d =~ s/__CFGNAME__/$cfgname/g; |
| 7 | + print $f " <ModuleDefinitionFile>$d</ModuleDefinitionFile>\n"; |
| 8 | + } |
| 9 | ++if ($self->{name} =~ /plperl/ and $self->{platform} eq 'Win32') { |
| 10 | ++print $f " <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n"; |
| 11 | ++} |
| 12 | + print $f <<EOF; |
| 13 | + </Link> |
| 14 | + <ResourceCompile> |
| 15 | +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm |
| 16 | +index fe905d3..10c6810 100644 |
| 17 | +--- a/src/tools/msvc/Mkvcbuild.pm |
| 18 | ++++ b/src/tools/msvc/Mkvcbuild.pm |
| 19 | +@@ -579,8 +582,8 @@ sub mkvcbuild |
| 20 | + } |
| 21 | + $plperl->AddReference($postgres); |
| 22 | + my @perl_libs = |
| 23 | +- grep { /perl\d+.lib$/ } |
| 24 | +- glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib'); |
| 25 | ++ grep { /perl\d+\.(lib|a)$/ } |
| 26 | ++ glob($solution->{options}->{perl} . '\lib\CORE\*.*'); |
| 27 | + if (@perl_libs == 1) |
| 28 | + { |
| 29 | + $plperl->AddLibrary($perl_libs[0]); |