Subversion Repositories DevTools

Rev

Rev 267 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 267 Rev 289
Line 809... Line 809...
809
    }
809
    }
810
}
810
}
811
 
811
 
812
 
812
 
813
###############################################################################
813
###############################################################################
814
#   ToolsetSHLD $name, \@args, \@objs, \@libraries )
814
#   ToolsetSHLD $name, \@args, \@objs, \@libraries, $ver )
815
#       This subroutine takes the user options and builds the rules
815
#       This subroutine takes the user options and builds the rules
816
#       required to link a shared library
816
#       required to link a shared library
817
#
817
#
818
#   Arguments:
818
#   Arguments:
819
#       --Def=xxxx.def[,opts]           # Definition file
819
#       --Def=xxxx.def[,opts]           # Definition file
Line 899... Line 899...
899
#
899
#
900
###############################################################################
900
###############################################################################
901
 
901
 
902
sub ToolsetSHLD
902
sub ToolsetSHLD
903
{
903
{
904
    our( $name, $pArgs, $pObjs, $pLibs ) = @_;
904
    our( $name, $pArgs, $pObjs, $pLibs, $ver ) = @_;
905
    our( $def, $mutual_dll, $res, @reslist, $doimplib, $stub_only );
905
    our( $def, $mutual_dll, $res, @reslist, $doimplib, $stub_only );
906
    our( $no_implib, $no_pdb, $resource_only );
906
    our( $no_implib, $no_pdb, $resource_only );
907
    our( $entry, $noaddlibs );
907
    our( $entry, $noaddlibs );
908
 
908
 
909
#.. Parse arguments
909
#.. Parse arguments
Line 1189... Line 1189...
1189
        #
1189
        #
1190
        #   --Implib flavor will create
1190
        #   --Implib flavor will create
1191
        #       a) Import library   $name$(GBE_TYPE).lib
1191
        #       a) Import library   $name$(GBE_TYPE).lib
1192
        #       b) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
1192
        #       b) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
1193
        #
1193
        #
1194
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$::SHLIB_VER{ $name }.$::so";
1194
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$ver.$::so";
1195
        BuildSHLD(
1195
        BuildSHLD(
1196
            "$name",                                    # Base Name
1196
            "$name",                        # Base Name
1197
            "$name\$(GBE_TYPE)",                        # Name of Export Lib
1197
            "$name\$(GBE_TYPE)",            # Name of Export Lib
1198
            "$name\$(GBE_TYPE).$::SHLIB_VER{ $name }"); # Name of the DLL + PDB
1198
            "$name\$(GBE_TYPE).$ver");      # Name of the DLL + PDB
1199
 
1199
 
1200
    } else {
1200
    } else {
1201
        #
1201
        #
1202
        #   Original flavor will create
1202
        #   Original flavor will create
1203
        #       a) Import library   $name$(GBE_TYPE).lib    ---+
1203
        #       a) Import library   $name$(GBE_TYPE).lib    ---+
Line 1205... Line 1205...
1205
        #       c) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
1205
        #       c) Versioned DLL    $name$(GBE_TYPE).xx.xx.xx.dll
1206
        #
1206
        #
1207
        MakePrint(
1207
        MakePrint(
1208
            "# .. Versioned image\n\n".
1208
            "# .. Versioned image\n\n".
1209
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$::so:\t".
1209
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$::so:\t".
1210
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$::SHLIB_VER{ $name }.$::so\n".
1210
            "\$(LIBDIR)/${name}\$(GBE_TYPE).$ver.$::so\n".
1211
            "\n" );
1211
            "\n" );
1212
 
1212
 
1213
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$::so";
1213
        $target_file_dll = "\$(LIBDIR)/$name\$(GBE_TYPE).$::so";
1214
        BuildSHLD( "$name", "$name\$(GBE_TYPE)" , "$name\$(GBE_TYPE)" );
1214
        BuildSHLD( "$name", "$name\$(GBE_TYPE)" , "$name\$(GBE_TYPE)" );
1215
        BuildSHLD( "$name", ""                  , "$name\$(GBE_TYPE).$::SHLIB_VER{ $name }" );
1215
        BuildSHLD( "$name", ""                  , "$name\$(GBE_TYPE).$ver" );
1216
    }
1216
    }
1217
 
1217
 
1218
    #.. Resource File
1218
    #.. Resource File
1219
    #
1219
    #
1220
    ToolsetRCrecipe( $res, @reslist )
1220
    ToolsetRCrecipe( $res, @reslist )