diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2005-10-10 17:28:31 +0300 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-10-10 11:22:08 +0000 |
| commit | 0added8b15cac1ea71069426f604832d35edbd96 (patch) | |
| tree | 94ed12998ad8294974c52ac12a469d6bc7bbae88 /symbian/xsbuild.pl | |
| parent | d13b0db44cac76f0adf0e6c3d90ab2721e4b6521 (diff) | |
| download | perl-0added8b15cac1ea71069426f604832d35edbd96.tar.gz | |
Symbian bleadperl@25725 update
Message-ID: <B356D8F434D20B40A8CEDAEC305A1F24E7A5C4@esebe105.NOE.Nokia.com>
p4raw-id: //depot/perl@25730
Diffstat (limited to 'symbian/xsbuild.pl')
| -rw-r--r-- | symbian/xsbuild.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl index afbc9ef4e5..f4140a96c0 100644 --- a/symbian/xsbuild.pl +++ b/symbian/xsbuild.pl @@ -214,6 +214,10 @@ sub write_mmp { read_mmp( \%CONF, "_init.mmp" ); read_mmp( \%CONF, "$base.mmp" ); + if ($base eq 'Zlib') { + push @{$CONF{USERINCLUDE}}, "$CWD\\zlib-src"; + } + for my $ui ( @{$userinclude} ) { $ui =~ s!/!\\!g; if ( $ui =~ m!^(?:[CD]:)?\\! ) { @@ -427,7 +431,7 @@ sub xsconfig { } } if ( my @c = glob("*.c *.cpp */*.c */*.cpp") ) { - @c = grep { ! m:^zlib-src/: } @c if $ext eq 'ext\Compress\Zlib'; + @c = grep { ! m:^zlib-src/: } @c if $ext eq 'ext\Compress\Zlib'; for my $c (@c) { $c =~ s:/:\\:g; $src{$c}++; @@ -441,10 +445,6 @@ sub xsconfig { $incdir{"$dir\\$h"}++ unless $h eq "."; } } - if ( $ext eq 'ext\Compress\Zlib' ) { - system_echo("perl -pi.bak -e s:True:False: config.in") == 0 - or die "$0: changing BUILD_ZLIB failed: $!\n"; - } if ( exists $EXTCFG{$ext} ) { for my $cfg ( @{ $EXTCFG{$ext} } ) { if ( $cfg =~ /^([-+])?(.+\.(c|cpp|h))$/ ) { |