Permalink
Browse files

[win32]

add support for strawberry distribution (http://strawberryperl.com/)

git-svn-id: https://svn.parrot.org/parrot/trunk@26295 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent 07a661e commit ba3fbfb28e55c65b41f6cf902f4e8c4cc6d1ddd4 @fperrad fperrad committed Mar 10, 2008
Showing with 15 additions and 7 deletions.
  1. +3 −2 README_win32.pod
  2. +12 −5 config/init/hints/mswin32.pm
View
@@ -165,8 +165,7 @@ L<http://downloads.sourceforge.net/mingw/MinGW-5.1.3.exe>
The HomePage is on L<http://www.mingw.org/>.
-With the ActiveState Perl distribution or PXPerl distribution,
-tell Configure.pl to use gcc :
+With the ActiveState Perl distribution, tell Configure.pl to use gcc :
perl Configure.pl
--cc=gcc
@@ -176,6 +175,8 @@ tell Configure.pl to use gcc :
or
perl Configure.pl --cc=gcc --without-icu
+With the strawberry distribution, gcc is already the compiler.
+
=item Intel C++
XXX
@@ -193,7 +193,7 @@ sub runstep {
my $make = $conf->data->get(qw(make));
if ( $make =~ /nmake/i ) {
- # ActiveState Perl or PXPerl
+ # ActiveState Perl
$conf->data->set(
a => '.a',
ar => 'ar',
@@ -208,18 +208,25 @@ sub runstep {
o => '.o',
blib_dir => 'blib\\lib',
);
- if ( $conf->data->get(qw(optimize)) eq "1" ) {
- $conf->data->set( optimize => '-O2' );
- }
}
elsif ( $make =~ /dmake/i ) {
- # mingw Perl
+ # strawberry Perl
+ $conf->data->set(
+ ccflags => '-DWIN32 ',
+ ldflags => '',
+ linkflags => '',
+ optimize => '',
+ );
}
else {
warn "unknown configuration";
}
+ if ( $conf->data->get(qw(optimize)) eq "1" ) {
+ $conf->data->set( optimize => '-O2' );
+ }
+
$conf->data->set(
parrot_is_shared => 1,
has_dynamic_linking => 1,

0 comments on commit ba3fbfb

Please sign in to comment.