mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-19 14:51:11 -06:00
Merge branch 'master' into sender
This commit is contained in:
commit
29d64107de
27 changed files with 372 additions and 104 deletions
6
Build.PL
6
Build.PL
|
@ -28,6 +28,8 @@ my %prereqs = qw(
|
|||
);
|
||||
my %recommends = qw(
|
||||
Class::XSAccessor 0
|
||||
LWP::UserAgent 0
|
||||
Net::Bonjour 0
|
||||
XML::SAX::ExpatXS 0
|
||||
);
|
||||
|
||||
|
@ -109,7 +111,9 @@ EOF
|
|||
my %modules = (%prereqs, %recommends);
|
||||
foreach my $module (sort keys %modules) {
|
||||
my $version = $modules{$module};
|
||||
my @cmd = ($cpanm, @cpanm_args, "$module~$version");
|
||||
my @cmd = ($cpanm, @cpanm_args);
|
||||
push @cmd, '-f', if $module eq 'OpenGL'; # temporary workaround for upstream bug in test
|
||||
push @cmd, "$module~$version";
|
||||
if ($module eq 'XML::SAX::ExpatXS' && $^O eq 'MSWin32') {
|
||||
my $mingw = 'C:\dev\CitrusPerl\mingw64';
|
||||
$mingw = 'C:\dev\CitrusPerl\mingw32' if !-d $mingw;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue