diff options
| author | Adam Russell <arussell@cs.uml.edu> | 2009-07-03 01:32:00 -0400 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2009-07-03 13:55:45 +0200 |
| commit | 7df6222977504e410ceadf36c0e45ae17aacbf21 (patch) | |
| tree | c1a0f2770a0e811aae260aa5e1494b006490004b /symbian | |
| parent | 906cdd2b284d712169319a6934ba68b578748c8f (diff) | |
| download | perl-7df6222977504e410ceadf36c0e45ae17aacbf21.tar.gz | |
Changes made by Osvaldo Villalon.
This patch cleans up config.pl
Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl>
Diffstat (limited to 'symbian')
| -rw-r--r-- | symbian/config.pl | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/symbian/config.pl b/symbian/config.pl index 5c26829b39..ab739fed63 100644 --- a/symbian/config.pl +++ b/symbian/config.pl @@ -28,8 +28,11 @@ if ($SYMBIAN_ROOT eq 'C:\Symbian\Series60_1_2_CW') { } my $WIN = $ENV{WIN} ; # 'wins', 'winscw' (from sdk.pl) -my $ARM = 'armv5'; # 'thumb', 'armv5' # Configuration for S60 5th Edition SDK v0.9 +my $ARM = 'thumb'; # 'thumb', 'armv5' my $S60SDK = $ENV{S60SDK}; # qw(1.2 2.0 2.1 2.6) (from sdk.pl) + if ($SDK_VARIANT eq 'S60' && $S60SDK =~ /^5\./) { + $ARM = 'armv5'; # 'thumb', 'armv5' # Configuration for S60 5th Edition SDK v1.0 + } my $S80SDK = $ENV{S80SDK}; # qw(2.0) (from sdk.pl) my $S90SDK = $ENV{S90SDK}; # qw(1.1) (from sdk.pl) my $UIQSDK = $ENV{UIQSDK}; # qw(2.0 2.1) (from sdk.pl) @@ -71,16 +74,26 @@ sub create_mmp { print $fh <<__EOF__; TARGET $target.$type TARGETTYPE $type -$targetpath -EPOCHEAPSIZE 1024 8388608 -EPOCSTACKSIZE 65536 +__EOF__ + if ($SDK_VARIANT eq 'S60' && $S60SDK =~ /^5\./) { + print $fh "UID\t0 0xEA3E9181\n" if $miniperl; + print $fh "UID\t0 0xED04DD86\n" if $perl; + print $fh "UID\t0x1000008d 0xE8667302\n" unless $miniperl || $perl; + print $fh "CAPABILITY\tNONE\n"; + } else { + print $targetpath; + print $fh "EPOCHEAPSIZE\t1024 8388608"; + print $fh "EPOCSTACKSIZE\t65536"; + } + print $fh <<__EOF__; EXPORTUNFROZEN SRCDBG __EOF__ if ($SDK_VARIANT eq 'S60') { - print $fh "MACRO\t__SERIES60__\n"; - print $fh "MACRO\t__SERIES60_1X__\n" if $S60SDK =~ /^1\./; - print $fh "MACRO\t__SERIES60_2X__\n" if $S60SDK =~ /^2\./; + print $fh "MACRO\t__SERIES60__\n"; + print $fh "MACRO\t__SERIES60_1X__\n" if $S60SDK =~ /^1\./; + print $fh "MACRO\t__SERIES60_2X__\n" if $S60SDK =~ /^2\./; + print $fh "MACRO\t__SERIES60_3X__\n" if $S60SDK =~ /^5\./; } if ($SDK_VARIANT eq 'S80') { print $fh "MACRO\t__SERIES80__\n"; @@ -180,9 +193,15 @@ __EOF__ print $fh <<__EOF__; MACRO PERL_GLOBAL_STRUCT MACRO PERL_GLOBAL_STRUCT_PRIVATE -RESOURCE symbian\\PerlUi.rss __EOF__ - } + } + unless ($miniperl || $perl ) { + if ($SDK_VARIANT eq 'S60' && $S60SDK =~ /^5\./) { + print $fh "START RESOURCE\tsymbian\\PerlUi.rss\nEND\n"; + } else { + print $fh "RESOURCE\tsymbian\\PerlUi.rss"; + } + } close $fh; } else { |