diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 2e87d81172d..d6fc1b7d542 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -6,7 +6,7 @@ package Mkvcbuild; # src/tools/msvc/Mkvcbuild.pm # use Carp; -use Win32; +use if ($^O eq "MSWin32"), 'Win32'; use strict; use warnings; use Project; @@ -648,9 +648,11 @@ sub mkvcbuild # 'Can't spawn "conftest.exe"'; suppress that. no warnings; + no strict 'subs'; + # Disable error dialog boxes like we do in the postmaster. # Here, we run code that triggers relevant errors. - use Win32API::File qw(SetErrorMode :SEM_); + use if ($^O eq "MSWin32"), 'Win32API::File', qw(SetErrorMode :SEM_); my $oldmode = SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); system(".\\$exe"); diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm index 7d25704e2c6..d90a996d467 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -22,7 +22,7 @@ sub _new my $self = { name => $name, type => $type, - guid => Win32::GuidGen(), + guid => $^O eq "MSWin32" ? Win32::GuidGen() : 'FAKE', files => {}, references => [], libraries => [], diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index a6b8b92c182..39470a869ed 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -60,10 +60,17 @@ sub DeterminePlatform { my $self = shift; - # Examine CL help output to determine if we are in 32 or 64-bit mode. - my $output = `cl /? 2>&1`; - $? >> 8 == 0 or die "cl command not found"; - $self->{platform} = ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; + if ($^O eq "MSWin32") + { + # Examine CL help output to determine if we are in 32 or 64-bit mode. + my $output = `cl /? 2>&1`; + $? >> 8 == 0 or die "cl command not found"; + $self->{platform} = ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; + } + else + { + $self->{platform} = 'FAKE'; + } print "Detected hardware platform: $self->{platform}\n"; return; } @@ -1061,7 +1068,7 @@ EOF } if ($fld ne "") { - $flduid{$fld} = Win32::GuidGen(); + $flduid{$fld} = $^O eq "MSWin32" ? Win32::GuidGen() : 'FAKE'; print $sln <&1`; - $? >> 8 == 0 - or croak - "Unable to determine Visual Studio version: The nmake command wasn't found."; - if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m) + if ($^O eq "MSWin32") { - return _GetVisualStudioVersion($1, $2); - } + # To determine version of Visual Studio we use nmake as it has + # existed for a long time and still exists in current Visual + # Studio versions. + my $output = `nmake /? 2>&1`; + $? >> 8 == 0 + or croak + "Unable to determine Visual Studio version: The nmake command wasn't found."; + if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m) + { + return _GetVisualStudioVersion($1, $2); + } - croak - "Unable to determine Visual Studio version: The nmake version could not be determined."; + croak + "Unable to determine Visual Studio version: The nmake version could not be determined."; + } + else + { + # fake version + return '16.00'; + } } sub _GetVisualStudioVersion