Changeset 9153 for trunk/make


Ignore:
Timestamp:
Aug 28, 2002, 6:42:06 AM (23 years ago)
Author:
bird
Message:

Splitted out the watcom linker into it own config files.
Option to use ilink with watcom environments.

Location:
trunk/make
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/make/setup.optional.watcom11x.mk

    r9137 r9153  
    1 # $Id: setup.optional.watcom11x.mk,v 1.4 2002-08-27 03:03:13 bird Exp $
     1# $Id: setup.optional.watcom11x.mk,v 1.5 2002-08-28 04:42:04 bird Exp $
    22
    33#
    … …  
    66#  Concidering the size of this, it really make sense putting it here.
    77#
    8 
    9 #
    10 # This is not optional (but I'm getting lazy)
    11 #
    12 _LD_FORMAT = $(BUILD_PLATFORM)
    13 !ifdef LD_FORMAT
    14 ! if "$(LD_FORMAT)" == "NE"
    15 _LD_FORMAT = $(BUILD_PLATFORM)-16
    16 ! else
    17 !  if "$(LD_FORMAT)" == "LX"
    18 _LD_FORMAT = os2
    19 !  else
    20 !   error LD_FORMAT other than NE and LXis not supported by this compiler ($(ENV_NAME)).
    21 !  endif
    22 ! endif
    23 !endif
    24 TOOL_DEFCONV    = $(PATH_TOOLS)\kDef2Wat.exe $(_LD_FORMAT)
    258
    269
    … …  
    245228                $(_CXX_OPT_R)
    246229
    247 
    248 #
    249 # Linker flags.
    250 #
    251 _LD_SORT            = Sort global
    252 # Option
    253 _LD_QUIET           =
    254 _LD_DEFAULT_LIBS    = ,nodefaultlibs
    255 _LD_ALIGN           =
    256 _LD_DOSSEG          = ,dosseg
    257 
    258 !if defined(LD_SORT_GLOBAL)
    259 _LD_SORT    = Sort global
    260 !endif
    261 !if defined(LD_SORT_ALPHABETICAL)
    262 _LD_SORT    = Sort alphabetical
    263 !endif
    264 !if defined(LD_SORT_BOTH)
    265 _LD_SORT    = Sort global alphabetical
    266 !endif
    267 
    268 # Option
    269 !if defined(BUILD_QUIET)
    270 _LD_QUIET   = ,quiet
    271 !endif
    272 !if defined(LD_ALIGN)
    273 _LD_ALIGN   = ,alignment=$(LD_ALIGN)
    274 !endif
    275 !if defined(LD_DEFAULT_LIBS) || defined(ALL_DEFAULT_LIBS)
    276 _LD_DEFAULT_LIBS =
    277 !endif
    278 !if defined(LD_DOSSEG_NO)
    279 _LD_DOSSEG  =
    280 !endif
    281 !if defined(LD_DOSSEG_YES)
    282 _LD_DOSSEG  = ,dosseg
    283 !endif
    284 
    285 _LD_OPTIONAL = $(_LD_SORT) Option verbose $(_LD_QUIET) $(_LD_ALIGN) $(_LD_DOSSEG)
    286 

  • trunk/make/setup.os2debwat11-16.mk

    r9138 r9153  
    1 # $Id: setup.os2debwat11-16.mk,v 1.12 2002-08-27 03:58:01 bird Exp $
     1# $Id: setup.os2debwat11-16.mk,v 1.13 2002-08-28 04:42:05 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, VAC optional stuff.
    1616#
    17 AS_DEBUG_TYPE = Codeview
     17AS_DEBUG_TYPE   = Codeview
    1818!include $(PATH_MAKE)\setup.os2debalp.mk
    19 !include $(PATH_MAKE)\setup.os2prfrc.mk
    20 !include $(PATH_MAKE)\setup.os2prfwrc.mk
     19!include $(PATH_MAKE)\setup.os2debrc.mk
     20!include $(PATH_MAKE)\setup.os2debwrc.mk
     21!ifdef LD_USE_ILINK
     22LD_OLDCPP       = 1
     23! include $(PATH_MAKE)\setup.os2debilink.mk
     24!else
     25_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
     26! include $(PATH_MAKE)\setup.os2debwlink.mk
     27!endif
    2128!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    2229
    … …  
    2835CC=wcc.exe
    2936CXX=wpp.exe
    30 LINK=wlink.exe
    3137IMPLIB=implib.exe
    3238
    … …  
    8995IMPLIB_FLAGS=/NOI /Nologo
    9096
    91 LINK_FLAGS=Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) Debug codeview all
    92 LINK_FLAGS_EXE=$(LINK_FLAGS)
    93 LINK_FLAGS_DLL=$(LINK_FLAGS)
    94 LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
    95 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
    96 LINK_FLAGS_IFS=$(LINK_FLAGS) segment type code preload segment type data preload
    97 LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
    98 LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
    99 LINK_CMD_SYS=$(LINK) $(LINK_FLAGS_SYS) @$(TARGET_LNK)
    100 LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
    101 LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
    102 LINK_LNK1=file       $(TARGET_OBJS: =^
    103 file       )
    104 LINK_LNK2=libpath    $(WATCOM)\lib286\os2;$(WATCOM)\lib286;
    105 LINK_LNK3=option map=$(TARGET_MAP)
    106 LINK_LNK4=library    $(TARGET_LIBS: =^, )
    107 LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    108 
    109 
    11097
    11198#

  • trunk/make/setup.os2debwat11.mk

    r9138 r9153  
    1 # $Id: setup.os2debwat11.mk,v 1.14 2002-08-27 03:58:01 bird Exp $
     1# $Id: setup.os2debwat11.mk,v 1.15 2002-08-28 04:42:05 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, VAC optional stuff.
    1616#
    17 AS_DEBUG_TYPE = Codeview
     17AS_DEBUG_TYPE   = Codeview
    1818!include $(PATH_MAKE)\setup.os2debalp.mk
    19 !include $(PATH_MAKE)\setup.os2prfrc.mk
    20 !include $(PATH_MAKE)\setup.os2prfwrc.mk
     19!include $(PATH_MAKE)\setup.os2debrc.mk
     20!include $(PATH_MAKE)\setup.os2debwrc.mk
     21!ifdef LD_USE_ILINK
     22LD_OLDCPP       = 1
     23! include $(PATH_MAKE)\setup.os2debilink.mk
     24!else
     25_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
     26! include $(PATH_MAKE)\setup.os2debwlink.mk
     27!endif
    2128!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    2229
    … …  
    2835CC=wcc386.exe
    2936CXX=wpp386.exe
    30 LINK=wlink.exe
    3137IMPLIB=implib.exe
    3238
    … …  
    8995IMPLIB_FLAGS=/NOI /Nologo
    9096
    91 LINK_FLAGS=Option eliminate, manglednames, caseexact, cache $(_LD_OPTIONAL) Debug codeview all
    92 LINK_FLAGS_EXE=$(LINK_FLAGS)
    93 LINK_FLAGS_DLL=$(LINK_FLAGS)
    94 LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
    95 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
    96 LINK_FLAGS_IFS=$(LINK_FLAGS_DLL) segment type code preload segment type data preload
    97 LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
    98 LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
    99 LINK_CMD_SYS=$(LINK) $(LINK_FLAGS_SYS) @$(TARGET_LNK)
    100 LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
    101 LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
    102 LINK_LNK1=file       $(TARGET_OBJS: =^
    103 file       )
    104 LINK_LNK2=libpath    $(WATCOM)\lib386\os2;$(WATCOM)\lib386;
    105 LINK_LNK3=option map=$(TARGET_MAP)
    106 LINK_LNK4=library    $(TARGET_LIBS: =^, )
    107 LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    108 
    109 
    11097
    11198#

  • trunk/make/setup.os2relwat11-16.mk

    r9138 r9153  
    1 # $Id: setup.os2relwat11-16.mk,v 1.10 2002-08-27 03:58:03 bird Exp $
     1# $Id: setup.os2relwat11-16.mk,v 1.11 2002-08-28 04:42:05 bird Exp $
    22
    33#
    … …  
    2222# Include some shared standard stuff: ALP, WRC, VAC optional stuff.
    2323#
    24 AS_DEBUG_TYPE = Codeview
     24AS_DEBUG_TYPE   = Codeview
    2525!include $(PATH_MAKE)\setup.os2relalp.mk
    2626!include $(PATH_MAKE)\setup.os2relrc.mk
    2727!include $(PATH_MAKE)\setup.os2relwrc.mk
     28!ifdef LD_USE_ILINK
     29LD_OLDCPP       = 1
     30! include $(PATH_MAKE)\setup.os2relilink.mk
     31!else
     32_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
     33! include $(PATH_MAKE)\setup.os2relwlink.mk
     34!endif
    2835!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    2936
    … …  
    3542CC=wcc.exe
    3643CXX=wpp.exe
    37 LINK=wlink.exe
    3844IMPLIB=implib.exe
    3945
    … …  
    98104IMPLIB_FLAGS=/NOI /Nologo
    99105
    100 LINK_FLAGS=Sort global Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) #Debug codeview all
    101 LINK_FLAGS_EXE=$(LINK_FLAGS)
    102 LINK_FLAGS_DLL=$(LINK_FLAGS)
    103 LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
    104 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
    105 LINK_FLAGS_IFS=$(LINK_FLAGS) segment type code preload segment type data preload
    106 LINK_CMD_EXE=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_EXE)
    107 LINK_CMD_DLL=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_DLL)
    108 LINK_CMD_SYS=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_SYS)
    109 LINK_CMD_VDD=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_VDD)
    110 LINK_CMD_IFS=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_IFS)
    111 LINK_LNK1=file       $(TARGET_OBJS: =^
    112 file       )
    113 LINK_LNK2=libpath    $(WATCOM)\lib286\os2;$(WATCOM)\lib286;
    114 LINK_LNK3=option map=$(TARGET_MAP)
    115 LINK_LNK4=library    $(TARGET_LIBS: =^, )
    116 LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    117 
    118 
    119106
    120107#

  • trunk/make/setup.os2relwat11.mk

    r9138 r9153  
    1 # $Id: setup.os2relwat11.mk,v 1.7 2002-08-27 03:58:03 bird Exp $
     1# $Id: setup.os2relwat11.mk,v 1.8 2002-08-28 04:42:05 bird Exp $
    22
    33#
    … …  
    2222# Include some shared standard stuff: ALP, VAC optional stuff.
    2323#
    24 AS_DEBUG_TYPE = Codeview
     24AS_DEBUG_TYPE   = Codeview
    2525!include $(PATH_MAKE)\setup.os2relalp.mk
    2626!include $(PATH_MAKE)\setup.os2relrc.mk
    2727!include $(PATH_MAKE)\setup.os2relwrc.mk
     28!include $(PATH_MAKE)\setup.os2relwlink.mk
     29!ifdef LD_USE_ILINK
     30LD_OLDCPP       = 1
     31! include $(PATH_MAKE)\setup.os2relilink.mk
     32!else
     33_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
     34! include $(PATH_MAKE)\setup.os2relwlink.mk
     35!endif
    2836!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    2937
    … …  
    96104IMPLIB_FLAGS=/NOI /Nologo
    97105
    98 LINK_FLAGS=Option eliminate, manglednames, caseexact, cache $(_LD_OPTIONAL) #Debug codeview all
    99 LINK_FLAGS_EXE=$(LINK_FLAGS)
    100 LINK_FLAGS_DLL=$(LINK_FLAGS)
    101 LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
    102 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
    103 LINK_FLAGS_IFS=$(LINK_FLAGS_DLL) segment type code preload segment type data preload
    104 LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
    105 LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
    106 LINK_CMD_SYS=$(LINK) $(LINK_FLAGS_SYS) @$(TARGET_LNK)
    107 LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
    108 LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
    109 LINK_LNK1=file       $(TARGET_OBJS: =^
    110 file       )
    111 LINK_LNK2=libpath    $(WATCOM)\lib386\os2;$(WATCOM)\lib386;
    112 LINK_LNK3=option map=$(TARGET_MAP)
    113 LINK_LNK4=library    $(TARGET_LIBS: =^, )
    114 LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    115 
    116 
    117106
    118107#

  • trunk/make/setup.win32debwat11.mk

    r9138 r9153  
    1 # $Id: setup.win32debwat11.mk,v 1.9 2002-08-27 03:58:03 bird Exp $
     1# $Id: setup.win32debwat11.mk,v 1.10 2002-08-28 04:42:06 bird Exp $
    22
    33# ---WIN32, DEBUG, WAT11-------------------------
    … …  
    1818!include $(PATH_MAKE)\setup.os2debrc.mk
    1919!include $(PATH_MAKE)\setup.os2debwrc.mk
     20!ifdef LD_USE_ILINK
     21! error error: LD_USE_ILINK isn't supported by the win32 watcom setup.
     22!else
     23# TODO!
     24_LD_LIBPATH     = $(PATH_WATCOM)\lib386\nt;$(PATH_WATCOM)\lib386;
     25! include $(PATH_MAKE)\setup.os2relwlink.mk
     26!endif
    2027!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    2128
    … …  
    6370IMPLIB_FLAGS=/NOI /Nologo
    6471
    65 # TODO?
    66 LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
    67 LINK_FLAGS_EXE=$(LINK_FLAGS)
    68 LINK_FLAGS_DLL=$(LINK_FLAGS)
    69 LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
    70 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
    71 LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
    72 LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
    73 LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
    74 LINK_CMD_SYS=$(LINK) $(LINK_FLAGS_SYS) @$(TARGET_LNK)
    75 LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
    76 LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
    77 LINK_LNK1=file       $(TARGET_OBJS: =^
    78 file       )
    79 LINK_LNK2=libpath    $(WATCOM)\lib386\nt;$(WATCOM)\lib386;
    80 LINK_LNK3=option map=$(TARGET_MAP)
    81 LINK_LNK4=library    $(TARGET_LIBS: =^, )
    82 LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    83 
    8472
    8573#
Note: See TracChangeset for help on using the changeset viewer.