Subversion Repositories DevTools

Rev

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

Rev 261 Rev 289
Line 51... Line 51...
51 
our $a;
 51 
our $a;
52 
our $so;
 52 
our $so;
53 
our $exe;
 53 
our $exe;
54 
our @ScmToolsetArgs;
 54 
our @ScmToolsetArgs;
55 
our @ScmPlatformArgs;
 55 
our @ScmPlatformArgs;
56 
our %SHLIB_VER;
 - 
 
57 
 
 56 
 
58 
##############################################################################
 57 
##############################################################################
59 
#   ToolsetInit()
 58 
#   ToolsetInit()
60 
#       Runtime initialisation
 59 
#       Runtime initialisation
61 
#
 60 
#
Line 373... Line 372...
373 
    MakePrint( "\n\t\$(ARMERGE)\n\n" );
 372 
    MakePrint( "\n\t\$(ARMERGE)\n\n" );
374 
}
 373 
}
375 
 
 374 
 
376 
 
 375 
 
377 
###############################################################################
 376 
###############################################################################
378 
#   ToolsetSHLD( $name, \@args, \@objs, \@libraries )
 377 
#   ToolsetSHLD( $name, \@args, \@objs, \@libraries, $ver )
379 
#       This subroutine takes the user options and builds the rules
 378 
#       This subroutine takes the user options and builds the rules
380 
#       required to link the program 'name'.
 379 
#       required to link the program 'name'.
381 
#
 380 
#
382 
#   Arguments:
 381 
#   Arguments:
383 
#       --WithMisalign
 382 
#       --WithMisalign
Line 400... Line 399...
400 
#       name_ld += ...
 399 
#       name_ld += ...
401 
#           :
 400 
#           :
402 
#
 401 
#
403 
###############################################################################
 402 
###############################################################################
404 
 
 403 
 
405 
 
 - 
 
406 
sub ToolsetSHLD
 404 
sub ToolsetSHLD
407 
{
 405 
{
408 
    my( $name, $pArgs, $pObjs, $pLibs ) = @_;
 406 
    my( $name, $pArgs, $pObjs, $pLibs, $ver ) = @_;
409 
    my( $shared, $merge_obj );
 407 
    my( $shared, $merge_obj );
410 
 
 408 
 
411 
#.. Parse arguments
 409 
#.. Parse arguments
412 
#
 410 
#
413 
    foreach $_ ( @$pArgs )
 411 
    foreach $_ ( @$pArgs )
Line 422... Line 420...
422 
        }
 420 
        }
423 
    }
 421 
    }
424 
 
 422 
 
425 
#.. Full name of shared library
 423 
#.. Full name of shared library
426 
#
 424 
#
427 
    $shared = "$name\$(GBE_TYPE).${so}.$SHLIB_VER{ $name }";
 425 
    $shared = "$name\$(GBE_TYPE).${so}.$ver";
428 
 
 426 
 
429 
#.. Install and package the shared libraries that are generated
 427 
#.. Install and package the shared libraries that are generated
430 
#
 428 
#
431 
    PackageShlibAddFiles( $name, "\$(LIBDIR)/${name}\$(GBE_TYPE).$::so" );
 429 
    PackageShlibAddFiles( $name, "\$(LIBDIR)/${name}\$(GBE_TYPE).$::so" );
432 
    PackageShlibAddFiles( $name, "\$(LIBDIR)/$shared" );
 430 
    PackageShlibAddFiles( $name, "\$(LIBDIR)/$shared" );