Subversion Repositories DevTools

Rev

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

Rev 279 Rev 283
Line 7455... Line 7455...
7455 
#                       3) Dirs specified by the array @SRCSDIRS
 7455 
#                       3) Dirs specified by the array @SRCSDIRS
7456 
#
 7456 
#
7457 
# Inputs          : Name of a file to resolve
 7457 
# Inputs          : Name of a file to resolve
7458 
#
 7458 
#
7459 
# Returns         : Resolved path.
 7459 
# Returns         : Resolved path.
7460 
#                   'empty' if not found at all
 7460 
#                   Input file - if not found at all
7461 
#
 7461 
#
7462 
sub MakeSrcResolve
 7462 
sub MakeSrcResolve
7463 
{
 7463 
{
7464 
    my ($name) = @_;
 7464 
    my ($name) = @_;
7465 
    my $file;
 7465 
    my $file;
Line 8472... Line 8472...
8472 
        foreach my $lib ( @libs )
 8472 
        foreach my $lib ( @libs )
8473 
        {
 8473 
        {
8474 
            my ($slib, $sdir) = split( ',', $lib );
 8474 
            my ($slib, $sdir) = split( ',', $lib );
8475 
 
 8475 
 
8476 
            #
 8476 
            #
8477 
            #   By default the librares are pulled from LOCAL
 8477 
            #   By default the librares are pulled from LOCAL unless the
- 
 
 8478 
            #   library is built in this directory, in which case it will
8478 
            #
 8479 
            #
- 
 
 8480 
            #
8479 
            $sdir = '--Local' unless ( $sdir );
 8481 
            unless ( $sdir )
8480 
 
 8482 
            {
- 
 
 8483 
                $sdir = ( exists $LIB_OBJS { $slib } ) ? '--Here' : '--Local';
- 
 
 8484 
            }
8481 
 
 8485 
 
8482 
            #
 8486 
            #
8483 
            #   --Interface     - Pull library from the interface directory
 8487 
            #   --Interface     - Pull library from the interface directory
8484 
            #   --Local         - Pull library from the local directory
 8488 
            #   --Local         - Pull library from the local directory
8485 
            #   --SubDir=xxxx   - Pull library from specified subdirectory
 8489 
            #   --SubDir=xxxx   - Pull library from specified subdirectory
- 
 
 8490 
            #   --Here          - Pull from local directory if built locally
8486 
            #   otherwise       - Pull library from specified subdirectory
 8491 
            #   otherwise       - Pull library from specified subdirectory
8487 
            #
 8492 
            #
8488 
            if ($sdir eq '--Interface') {
 8493 
            if ($sdir eq '--Interface') {
8489 
                $sdir = '$(LIBDIR_INTERFACE)/$(GBE_PLATFORM)';
 8494 
                $sdir = '$(LIBDIR_INTERFACE)/$(GBE_PLATFORM)';
8490 
 
 8495 
 
Line 8493... Line 8498...
8493 
                        $PackageInfo{'Lib'}{'Dir'};     # Default subdir
 8498 
                        $PackageInfo{'Lib'}{'Dir'};     # Default subdir
8494 
 
 8499 
 
8495 
            } elsif ( $sdir =~ m~^--SubDir=(.*)~ ) {
 8500 
            } elsif ( $sdir =~ m~^--SubDir=(.*)~ ) {
8496 
                $sdir = $1 . '/$(LIBDIR)';
 8501 
                $sdir = $1 . '/$(LIBDIR)';
8497 
 
 8502 
 
- 
 
 8503 
            } elsif ( $sdir eq '--Here') {
- 
 
 8504 
                $sdir = '$(LIBDIR)';
- 
 
 8505 
 
8498 
            } else {
 8506 
            } else {
8499 
                $sdir .= '/$(LIBDIR)';
 8507 
                $sdir .= '/$(LIBDIR)';
8500 
            }
 8508 
            }
8501 
 
 8509 
 
8502 
            MakePrint "\\\n\t\t${sdir}/${slib}\$(GBE_TYPE).$::a";
 8510 
            MakePrint "\\\n\t\t${sdir}/${slib}\$(GBE_TYPE).$::a";