Subversion Repositories DevTools

Rev

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

Rev 287 Rev 289
Line 544... Line 544...
544
    }
544
    }
545
}
545
}
546
 
546
 
547
 
547
 
548
###############################################################################
548
###############################################################################
549
#   ToolsetSHLD $name, \@args, \@objs, \@libraries )
549
#   ToolsetSHLD $name, \@args, \@objs, \@libraries, $_ver )
550
#       This subroutine takes the user options and builds the rules
550
#       This subroutine takes the user options and builds the rules
551
#       required to link a shared library
551
#       required to link a shared library
552
#
552
#
553
#   Arguments:
553
#   Arguments:
554
#       --Def=xxxx.def[,opts]           # Definition file
554
#       --Def=xxxx.def[,opts]           # Definition file
Line 634... Line 634...
634
#
634
#
635
###############################################################################
635
###############################################################################
636
 
636
 
637
sub ToolsetSHLD
637
sub ToolsetSHLD
638
{
638
{
639
    our( $name, $pArgs, $pObjs, $pLibs ) = @_;
639
    our( $name, $pArgs, $pObjs, $pLibs, $_ver ) = @_;
640
    our( $def, $mutual_dll, $res, @reslist, $doimplib, $stub_only );
640
    our( $def, $mutual_dll, $res, @reslist, $doimplib, $stub_only );
641
    our( $no_implib, $no_pdb, $resource_only );
641
    our( $no_implib, $no_pdb, $resource_only );
642
    our( $entry, $noaddlibs );
642
    our( $entry, $noaddlibs );
643
 
643
 
644
#.. Parse arguments
644
#.. Parse arguments
Line 926... Line 926...
926
        #
926
        #
927
        #   --Implib flavor will create
927
        #   --Implib flavor will create
928
        #       a) Import library   $name$(GBE_TYPE).lib
928
        #       a) Import library   $name$(GBE_TYPE).lib
929
        #       b) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
929
        #       b) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
930
        #
930
        #
931
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$::SHLIB_VER{ $name }.$::so";
931
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$_ver.$::so";
932
        BuildSHLD(
932
        BuildSHLD(
933
            "$name",                                    # Base Name
933
            "$name",                        # Base Name
934
            "$name\$(GBE_TYPE)",                        # Name of Export Lib
934
            "$name\$(GBE_TYPE)",            # Name of Export Lib
935
            "$name\$(GBE_TYPE).$::SHLIB_VER{ $name }"); # Name of the DLL + PDB
935
            "$name\$(GBE_TYPE).$_ver");      # Name of the DLL + PDB
936
 
936
 
937
    } else {
937
    } else {
938
        #
938
        #
939
        #   Original flavor will create
939
        #   Original flavor will create
940
        #       a) Import library   $name$(GBE_TYPE).lib    ---+
940
        #       a) Import library   $name$(GBE_TYPE).lib    ---+
941
        #       b) Unversioned DLL  $name$(GBE_TYPE).dll    <--+
941
        #       b) Unversioned DLL  $name$(GBE_TYPE).dll    <--+
942
        #       c) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
942
        #       c) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
943
        #
943
        #
944
        MakePrint(
944
        MakePrint(
945
            "# .. Versioned image\n\n".
945
            "# .. Versioned image\n\n".
946
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$::SHLIB_VER{ $name }.$::so:\t".
946
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$_ver.$::so:\t".
947
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$::so\n".
947
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$::so\n".
948
            "\n" );
948
            "\n" );
949
 
949
 
950
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$::so";
950
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$::so";
951
        BuildSHLD( "$name", ""                  , "$name\$(GBE_TYPE).$::SHLIB_VER{ $name }" );
951
        BuildSHLD( "$name", ""                  , "$name\$(GBE_TYPE).$_ver" );
952
        BuildSHLD( "$name", "$name\$(GBE_TYPE)" , "$name\$(GBE_TYPE)" );
952
        BuildSHLD( "$name", "$name\$(GBE_TYPE)" , "$name\$(GBE_TYPE)" );
953
    }
953
    }
954
 
954
 
955
    #.. Resource File
955
    #.. Resource File
956
    #
956
    #