Removed dependency on Storable; some fixes in Build.PL. #1693
This commit is contained in:
parent
c99b9d91db
commit
e7349622a2
10
Build.PL
10
Build.PL
@ -18,7 +18,6 @@ my %prereqs = qw(
|
|||||||
Module::Build::WithXSpp 0.14
|
Module::Build::WithXSpp 0.14
|
||||||
Moo 1.003001
|
Moo 1.003001
|
||||||
Scalar::Util 0
|
Scalar::Util 0
|
||||||
Storable 0
|
|
||||||
Test::Harness 0
|
Test::Harness 0
|
||||||
Test::More 0
|
Test::More 0
|
||||||
IO::Scalar 0
|
IO::Scalar 0
|
||||||
@ -29,7 +28,8 @@ my %recommends = qw(
|
|||||||
XML::SAX::ExpatXS 0
|
XML::SAX::ExpatXS 0
|
||||||
);
|
);
|
||||||
|
|
||||||
my $gui = defined $ARGV[0] && $ARGV[0] eq '--gui';
|
my $gui = grep { $_ eq '--gui' } @ARGV;
|
||||||
|
my $xs_only = grep { $_ eq '--xs' } @ARGV;
|
||||||
if ($gui) {
|
if ($gui) {
|
||||||
%prereqs = qw(
|
%prereqs = qw(
|
||||||
Wx 0.9918
|
Wx 0.9918
|
||||||
@ -39,6 +39,8 @@ if ($gui) {
|
|||||||
Wx::GLCanvas 0
|
Wx::GLCanvas 0
|
||||||
OpenGL 0
|
OpenGL 0
|
||||||
);
|
);
|
||||||
|
} elsif ($xs_only) {
|
||||||
|
%prereqs = %recommends = ();
|
||||||
}
|
}
|
||||||
|
|
||||||
my @missing_prereqs = ();
|
my @missing_prereqs = ();
|
||||||
@ -125,9 +127,7 @@ EOF
|
|||||||
# with current perl binary
|
# with current perl binary
|
||||||
if (-e './xs/Build') {
|
if (-e './xs/Build') {
|
||||||
if ($^O eq 'MSWin32') {
|
if ($^O eq 'MSWin32') {
|
||||||
system 'cd', 'xs';
|
system '.\xs\Build', 'distclean';
|
||||||
system 'Build', 'distclean';
|
|
||||||
system 'cd', '..';
|
|
||||||
} else {
|
} else {
|
||||||
system './xs/Build', 'distclean';
|
system './xs/Build', 'distclean';
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@ use warnings;
|
|||||||
|
|
||||||
use Slic3r::Geometry qw(A B X Y X1 X2 Y1 Y2);
|
use Slic3r::Geometry qw(A B X Y X1 X2 Y1 Y2);
|
||||||
use Slic3r::Geometry::Clipper qw(JT_SQUARE);
|
use Slic3r::Geometry::Clipper qw(JT_SQUARE);
|
||||||
use Storable qw();
|
|
||||||
|
|
||||||
sub new_scale {
|
sub new_scale {
|
||||||
my $class = shift;
|
my $class = shift;
|
||||||
|
Loading…
Reference in New Issue
Block a user