Changeset 2775 for trunk/kBuild


Ignore:
Timestamp:
Feb 3, 2015, 9:00:15 PM (10 years ago)
Author:
bird
Message:

tools/G*.kmk: The OS/2 librarian can convert .dll into import libraries, so pass .dll source files to it alongside .imp and .def files.

Location:
trunk/kBuild/tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/GCC3.kmk

    r2774 r2775  
    238238        $(QUIET)$(APPEND) -n $(out).ar-script \
    239239                $(foreach o,$(objs), 'ADDMOD $(o)') \
    240                 $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
    241         $(if $(filter %.def %.imp,$(othersrc))\
    242                 ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
     240                $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
     241        $(if $(filter %.def %.imp %.dll,$(othersrc))\
     242                ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
    243243                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
    244244        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'

  • trunk/kBuild/tools/GCC32.kmk

    r2774 r2775  
    233233        $(QUIET)$(APPEND) -n $(out).ar-script \
    234234                $(foreach o,$(objs), 'ADDMOD $(o)') \
    235                 $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
    236         $(if $(filter %.def %.imp,$(othersrc))\
    237                 ,$(TOOL_GCC32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
     235                $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
     236        $(if $(filter %.def %.imp %.dll,$(othersrc))\
     237                ,$(TOOL_GCC32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
    238238                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
    239239        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'

  • trunk/kBuild/tools/GCC3OMF.kmk

    r2774 r2775  
    217217TOOL_GCC3OMF_LINK_LIBRARY_DEPORD =
    218218define TOOL_GCC3OMF_LINK_LIBRARY_CMDS
    219         $(if $(filter %.def %.imp,$(othersrc))\
    220                 ,$(QUIET)$(APPEND) -n $(outbase).rsp $(filter %.def %.imp,$(othersrc))\
     219        $(if $(filter %.def %.imp %.dll,$(othersrc))\
     220                ,$(QUIET)$(APPEND) -n $(outbase).rsp $(filter %.def %.imp %.dll,$(othersrc))\
    221221                 $(NL)$(TAB)$(QUIET)$(QUIET)$(TOOL_GCC3OMF_AR_IMP) -o $(out) @$(outbase).rsp\
    222222                 $(NL)$(TAB)$(QUIET)$(RM) -f $(outbase).rsp)
    223         $(QUIET)$(APPEND) -n $(outbase).rsp $(flags) $(out) $(objs) $(filter-out %.def %.imp,$(othersrc))
     223        $(QUIET)$(APPEND) -n $(outbase).rsp $(flags) $(out) $(objs) $(filter-out %.def %.imp %.dll,$(othersrc))
    224224        $(QUIET)$(TOOL_GCC3OMF_AR) @$(outbase).rsp
    225225endef

  • trunk/kBuild/tools/GXX3.kmk

    r2774 r2775  
    238238        $(QUIET)$(APPEND) -n $(out).ar-script \
    239239                $(foreach o,$(objs), 'ADDMOD $(o)') \
    240                 $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
    241         $(if $(filter %.def %.imp,$(othersrc))\
    242                 ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
     240                $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
     241        $(if $(filter %.def %.imp %.dll,$(othersrc))\
     242                ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
    243243                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
    244244        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'

  • trunk/kBuild/tools/GXX32.kmk

    r2774 r2775  
    232232        $(QUIET)$(APPEND) -n $(out).ar-script \
    233233                $(foreach o,$(objs), 'ADDMOD $(o)') \
    234                 $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
    235         $(if $(filter %.def %.imp,$(othersrc))\
    236                 ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
     234                $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
     235        $(if $(filter %.def %.imp %.dll,$(othersrc))\
     236                ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
    237237                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
    238238        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'

  • trunk/kBuild/tools/GXX3OMF.kmk

    r2774 r2775  
    217217TOOL_GXX3OMF_LINK_LIBRARY_DEPORD =
    218218define TOOL_GXX3OMF_LINK_LIBRARY_CMDS
    219         $(if $(filter %.def %.imp,$(othersrc))\
    220                 ,$(QUIET)$(APPEND) -n $(outbase).rsp $(filter %.def %.imp,$(othersrc))\
     219        $(if $(filter %.def %.imp %.dll,$(othersrc))\
     220                ,$(QUIET)$(APPEND) -n $(outbase).rsp $(filter %.def %.imp %.dll,$(othersrc))\
    221221                 $(NL)$(TAB)$(QUIET)$(QUIET)$(TOOL_GXX3OMF_AR_IMP) -o $(out) @$(outbase).rsp\
    222222                 $(NL)$(TAB)$(QUIET)$(RM) -f $(outbase).rsp)
    223         $(QUIET)$(APPEND) -n $(outbase).rsp $(flags) $(out) $(objs) $(filter-out %.def %.imp,$(othersrc))
     223        $(QUIET)$(APPEND) -n $(outbase).rsp $(flags) $(out) $(objs) $(filter-out %.def %.imp %.dll,$(othersrc))
    224224        $(QUIET)$(TOOL_GXX3OMF_AR) @$(outbase).rsp
    225225endef
Note: See TracChangeset for help on using the changeset viewer.