From 332c5e4672c28dd97e9512e47ca2bdf383a1bf3b Mon Sep 17 00:00:00 2001
From: František Dvořák <valtri@civ.zcu.cz>
Date: Sun, 6 Jul 2014 18:00:22 +0200
Subject: MinGW prefixes inside Combiner.pm module.

---
 combiner/Combiner.pm | 7 +++++--
 combiner/flac.pl     | 4 ++--
 combiner/speex.pl    | 4 ++--
 combiner/wavpack.pl  | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/combiner/Combiner.pm b/combiner/Combiner.pm
index bd0ecfb..6fce519 100644
--- a/combiner/Combiner.pm
+++ b/combiner/Combiner.pm
@@ -5,8 +5,11 @@ use warnings;
 use Exporter;
 
 our @ISA = qw(Exporter);
-our @EXPORT_OK = qw(nop init_w32 init_w64 combiner combiners);
-our @EXPORT = qw(nop init_w32 init_w64 combiner combiners);
+our @EXPORT_OK = qw(nop init_w32 init_w64 combiner combiners w32);
+our @EXPORT = qw(nop init_w32 init_w64 combiner combiners w66);
+
+our $w32 = '/usr/i686-w64-mingw32/sys-root/mingw/bin/';
+our $w64 = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/';
 
 
 sub nop() {
diff --git a/combiner/flac.pl b/combiner/flac.pl
index 6d37b25..a4d6b0e 100755
--- a/combiner/flac.pl
+++ b/combiner/flac.pl
@@ -5,8 +5,8 @@ use warnings;
 our @EXPORT_OK = qw(combiner);
 use Combiner;
 
-my $w32 = '/usr/i686-w64-mingw32/sys-root/mingw/bin/';
-my $w64 = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/';
+my $w32 = $Combiner::w32;
+my $w64 = $Combiner::w64;
 
 my ($cmd, $dir);
 
diff --git a/combiner/speex.pl b/combiner/speex.pl
index 90fba80..7566523 100755
--- a/combiner/speex.pl
+++ b/combiner/speex.pl
@@ -4,8 +4,8 @@ use strict;
 use warnings;
 use Combiner;
 
-my $w32 = '/usr/i686-w64-mingw32/sys-root/mingw/bin/';
-my $w64 = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/';
+my $w32 = $Combiner::w32;
+my $w64 = $Combiner::w64;
 
 my ($cmd, $dir);
 
diff --git a/combiner/wavpack.pl b/combiner/wavpack.pl
index 54ae49d..3a0e24f 100755
--- a/combiner/wavpack.pl
+++ b/combiner/wavpack.pl
@@ -4,8 +4,8 @@ use strict;
 use warnings;
 use Combiner;
 
-my $w32 = '/usr/i686-w64-mingw32/sys-root/mingw/bin/';
-my $w64 = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/';
+my $w32 = $Combiner::w32;
+my $w64 = $Combiner::w64;
 
 my ($cmd, $dir);
 
-- 
cgit