diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-06-19 12:15:49 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-06-19 12:15:49 +0000 |
commit | aaa34702f1178d521fb2dfc427f6bac7257e74b2 (patch) | |
tree | 2f37a24ef0c9b3628f53c0e9ded4ca76c5374b28 | |
parent | ce3a5099932dc39fe6dae4d7b57fbc14c8639d42 (diff) | |
download | MPC-aaa34702f1178d521fb2dfc427f6bac7257e74b2.tar.gz |
ChangeLogTag: Thu Jun 19 07:13:16 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | modules/ProjectCreator.pm | 19 | ||||
-rw-r--r-- | templates/makedll.mpt | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index 26cf9b91..90205382 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -421,8 +421,9 @@ sub parse_line { } } elsif ($comp eq 'specific') { + my(@types) = split(/\s*,\s*/, $name); ($status, $errorString) = $self->parse_scope( - $ih, $values[1], $values[2], \%validNames, + $ih, $values[1], \@types, \%validNames, $self->{'type_specific_assign'}->{$self->{'pctype'}}); } elsif ($comp eq 'define_custom') { @@ -799,16 +800,18 @@ sub parse_define_custom { sub handle_scoped_end { my($self) = shift; - my($type) = shift; + my($types) = shift; my($flags) = shift; - if (defined $self->{'type_specific_assign'}->{$type}) { - foreach my $key (keys %$flags) { - $self->{'type_specific_assign'}->{$type}->{$key} = $$flags{$key}; + foreach my $type (@$types) { + if (defined $self->{'type_specific_assign'}->{$type}) { + foreach my $key (keys %$flags) { + $self->{'type_specific_assign'}->{$type}->{$key} = $$flags{$key}; + } + } + else { + $self->{'type_specific_assign'}->{$type} = $flags; } - } - else { - $self->{'type_specific_assign'}->{$type} = $flags; } } diff --git a/templates/makedll.mpt b/templates/makedll.mpt index 3b24a874..15e8c50f 100644 --- a/templates/makedll.mpt +++ b/templates/makedll.mpt @@ -1,5 +1,6 @@ configurations = gcc soext = so +ssl_libs = ssl crypto zzip_libs = z zziplib gcc { |