Subversion Repositories DevTools

Rev

Rev 369 | Rev 373 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 369 Rev 371
Line 4147... Line 4147...
4147
    #
4147
    #
4148
    #   Process each element
4148
    #   Process each element
4149
    #
4149
    #
4150
    foreach (@elements)
4150
    foreach (@elements)
4151
    {
4151
    {
-
 
4152
        if ( /^\s+/ )
-
 
4153
        {
-
 
4154
            Error ("Argument cannot start with a space: '$_'");
-
 
4155
        }
4152
        if ( /^--Shared/ )
4156
        if ( /^--Shared/ )
4153
        {
4157
        {
4154
            Error( "--Shared not valid for a static library" );
4158
            Error( "--Shared not valid for a static library" );
4155
        }
4159
        }
4156
 
4160
 
Line 4264... Line 4268...
4264
    #.. Collect --Shared arguments
4268
    #.. Collect --Shared arguments
4265
    #   Need to process this one first so that we have a version number
4269
    #   Need to process this one first so that we have a version number
4266
    #
4270
    #
4267
    foreach (@elements)
4271
    foreach (@elements)
4268
    {
4272
    {
-
 
4273
        if ( /^\s+/ )
-
 
4274
        {
-
 
4275
            Error ("Argument cannot start with a space: '$_'");
-
 
4276
        }
4269
        next unless ( /^--Shared/ );
4277
        next unless ( /^--Shared/ );
4270
 
4278
 
4271
        my $shared;
4279
        my $shared;
4272
        if ( /^--Shared$/ )
4280
        if ( /^--Shared$/ )
4273
        {
4281
        {
Line 4501... Line 4509...
4501
    #.. Shared library objects,
4509
    #.. Shared library objects,
4502
    #       Must explicitly relate source and object, as shared libraries
4510
    #       Must explicitly relate source and object, as shared libraries
4503
    #       objects are built within a library specific subdirs.
4511
    #       objects are built within a library specific subdirs.
4504
    #
4512
    #
4505
    $OBJSOURCE{ $obj } = $srcfile
4513
    $OBJSOURCE{ $obj } = $srcfile
4506
        if ( $shared );
4514
        if ( $shared && defined $srcfile );
4507
 
4515
 
4508
    return $obj;
4516
    return $obj;
4509
}
4517
}
4510
 
4518
 
4511
 
4519
 
Line 8947... Line 8955...
8947
#       Toolset ...
8955
#       Toolset ...
8948
#
8956
#
8949
#   
8957
#   
8950
#
8958
#
8951
    MakeHeader ("Construct Objects");
8959
    MakeHeader ("Construct Objects");
-
 
8960
 
8952
    foreach my $i ( sort keys %OBJSOURCE )
8961
    foreach my $i ( sort keys %OBJSOURCE )
8953
    {
8962
    {
8954
        my( $src, $sname, $ext, $type, @args );
8963
        my( $src, $sname, $ext, $type, @args );
8955
 
8964
 
8956
        $src  = $OBJSOURCE{ $i };
8965
        $src  = $OBJSOURCE{ $i };