From e7349622a2745fad1ea62337e9590d422886398c Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 11 Jan 2014 21:46:22 +0100 Subject: [PATCH] Removed dependency on Storable; some fixes in Build.PL. #1693 --- Build.PL | 10 +++++----- lib/Slic3r/Polyline.pm | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Build.PL b/Build.PL index e5ad62ccd..25a37f93d 100644 --- a/Build.PL +++ b/Build.PL @@ -18,7 +18,6 @@ my %prereqs = qw( Module::Build::WithXSpp 0.14 Moo 1.003001 Scalar::Util 0 - Storable 0 Test::Harness 0 Test::More 0 IO::Scalar 0 @@ -29,7 +28,8 @@ my %recommends = qw( 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) { %prereqs = qw( Wx 0.9918 @@ -39,6 +39,8 @@ if ($gui) { Wx::GLCanvas 0 OpenGL 0 ); +} elsif ($xs_only) { + %prereqs = %recommends = (); } my @missing_prereqs = (); @@ -125,9 +127,7 @@ EOF # with current perl binary if (-e './xs/Build') { if ($^O eq 'MSWin32') { - system 'cd', 'xs'; - system 'Build', 'distclean'; - system 'cd', '..'; + system '.\xs\Build', 'distclean'; } else { system './xs/Build', 'distclean'; } diff --git a/lib/Slic3r/Polyline.pm b/lib/Slic3r/Polyline.pm index a75f85379..7cd431254 100644 --- a/lib/Slic3r/Polyline.pm +++ b/lib/Slic3r/Polyline.pm @@ -4,7 +4,6 @@ use warnings; use Slic3r::Geometry qw(A B X Y X1 X2 Y1 Y2); use Slic3r::Geometry::Clipper qw(JT_SQUARE); -use Storable qw(); sub new_scale { my $class = shift;