Changeset 8362 for trunk/make


Ignore:
Timestamp:
May 1, 2002, 6:00:18 AM (24 years ago)
Author:
bird
Message:

Support for .def files with the watcom linker.

Location:
trunk/make
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/make/process.mak

    r8355 r8362  
    1 # $Id: process.mak,v 1.11 2002-04-30 19:50:40 bird Exp $
     1# $Id: process.mak,v 1.12 2002-05-01 04:00:17 bird Exp $
    22
    33#
    … …  
    713713#
    714714$(TARGET_LNK): $(MAKE_INCLUDE_PROCESS) $(MAKE_INCLUDE_SETUP) $(PATH_MAKE)\setup.mak $(MAKEFILE)
     715!ifndef TOOL_DEFCONV
    715716    @$(ECHO) Creating Linker Input File $(CLRRST)<<$@
    716717$(LINK_LNK1)
    … …  
    720721$(LINK_LNK5)
    721722<<KEEP
     723!else
     724    @$(ECHO) Creating Linker Input File $(CLRRST) $@
     725    @$(TOOL_RM) $@
     726! ifdef BUILD_VERBOSE
     727    @ \
     728! endif
     729    $(TOOL_DEFCONV) $(TARGET_DEF_LINK) $@ <<$(TARGET_LNK)2
     730#
     731# LINK_LNK[1-5]:
     732#
     733$(LINK_LNK1)
     734$(LINK_LNK2)
     735$(LINK_LNK3)
     736$(LINK_LNK4)
     737$(LINK_LNK5)
     738<<keep
     739!endif
    722740!ifdef BUILD_VERBOSE
    723741    @type $@

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

    r8354 r8362  
    1 # $Id: setup.optional.watcom11x.mk,v 1.2 2002-04-30 19:48:59 bird Exp $
     1# $Id: setup.optional.watcom11x.mk,v 1.3 2002-05-01 04:00:18 bird Exp $
    22
    33#
    … …  
    77#
    88
     9#
     10# This is not optional (but I'm getting lazy)
     11#
     12TOOL_DEFCONV    = $(PATH_TOOLS)\kDef2Wat.exe $(BUILD_PLATFORM)
    913
    1014#

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

    r8351 r8362  
    1 # $Id: setup.os2debwat11-16.mk,v 1.1 2002-04-30 19:44:31 bird Exp $
     1# $Id: setup.os2debwat11-16.mk,v 1.2 2002-05-01 04:00:18 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    6666IMPLIB_FLAGS=/NOI /Nologo
    6767
    68 LINK_FLAGS=format os2 lx pmcompatible option quiet, stack=$(TARGET_STACKSIZE)
     68LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
    6969LINK_FLAGS_EXE=$(LINK_FLAGS)
    7070LINK_FLAGS_DLL=$(LINK_FLAGS)
    71 LINK_FLAGS_SYS=format os2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    72 LINK_FLAGS_VDD=format os2 virtdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    73 LINK_FLAGS_IFS=$(LINK_FLAGS_DLL)
     71LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
     72LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
     73LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
    7474LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
    7575LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
    … …  
    7777LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
    7878LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
    79 LINK_LNK1=file $(TARGET_OBJS: =^
    80 file )
    81 LINK_LNK2=libpath $(WATCOM)\lib286;$(WATCOM)\lib286\os2;
     79LINK_LNK1=file       $(TARGET_OBJS: =^
     80file       )
     81LINK_LNK2=libpath    $(WATCOM)\lib386\os2;$(WATCOM)\lib386;
    8282LINK_LNK3=option map=$(TARGET_MAP)
    83 LINK_LNK4=library $(TARGET_LIBS: =^, )
    84 LINK_LNK5=name $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
     83LINK_LNK4=library    $(TARGET_LIBS: =^, )
     84LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    8585
    8686RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)

  • trunk/make/setup.os2debwat11.mk

    r8354 r8362  
    1 # $Id: setup.os2debwat11.mk,v 1.6 2002-04-30 19:47:35 bird Exp $
     1# $Id: setup.os2debwat11.mk,v 1.7 2002-05-01 04:00:18 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    6363IMPLIB_FLAGS=/NOI /Nologo
    6464
    65 LINK_FLAGS=format os2 lx pmcompatible option quiet, map
     65LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
    6666LINK_FLAGS_EXE=$(LINK_FLAGS)
    6767LINK_FLAGS_DLL=$(LINK_FLAGS)
    68 LINK_FLAGS_SYS=format os2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    69 LINK_FLAGS_VDD=format os2 virtdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    70 LINK_FLAGS_IFS=$(LINK_FLAGS_DLL)
     68LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
     69LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
     70LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
    7171LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
    7272LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
    … …  
    7474LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
    7575LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
    76 LINK_LNK1=file $(TARGET_OBJS: =^
    77 file )
    78 LINK_LNK2=libpath $(WATCOM)\lib386;$(WATCOM)\lib386\os2;
     76LINK_LNK1=file       $(TARGET_OBJS: =^
     77file       )
     78LINK_LNK2=libpath    $(WATCOM)\lib386\os2;$(WATCOM)\lib386;
    7979LINK_LNK3=option map=$(TARGET_MAP)
    80 LINK_LNK4=library $(TARGET_LIBS: =^, )
    81 LINK_LNK5=name $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
     80LINK_LNK4=library    $(TARGET_LIBS: =^, )
     81LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    8282
    8383RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)

  • trunk/make/setup.win32debwat11.mk

    r8296 r8362  
    1 # $Id: setup.win32debwat11.mk,v 1.3 2002-04-22 02:09:29 bird Exp $
     1# $Id: setup.win32debwat11.mk,v 1.4 2002-05-01 04:00:18 bird Exp $
    22
    33# ---WIN32, DEBUG, WAT11-------------------------
    … …  
    1212
    1313#
    14 # Include some shared standard stuff: ALP.
     14# Include some shared standard stuff: ALP, optional stuff.
    1515#
    1616!include $(PATH_MAKE)\setup.os2debalp.mk
     17!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    1718
    1819
    … …  
    4041AR_LNK2= $(@R).lst
    4142
    42 CC_FLAGS_OS = -bt=nt
    43 
    44 CC_FLAGS=$(CC_FLAGS_OS) -zq -zl -bm -ze -w4 -dDEBUG -d2 -hc -zc $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     43CC_FLAGS=-bt=os2v2 -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -d2 -hc -zc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    4544CC_FLAGS_EXE=$(CC_FLAGS)
    4645CC_FLAGS_DLL=$(CC_FLAGS) -bd
    47 CC_FLAGS_CRT=$(CC_FLAGS) -bd -br
    48 CC_FLAGS_SYS=$(CC_FLAGS)
     46CC_FLAGS_SYS=$(CC_FLAGS) -s -zdp -zff -zgf
    4947CC_FLAGS_VDD=$(CC_FLAGS_SYS)
    50 CC_FLAGS_IFS=$(CC_FLAGS_SYS)
     48CC_FLAGS_IFS=$(CC_FLAGS_SYS) -bd
    5149CC_OBJ_OUT=-fo=
    5250CC_LST_OUT=
    53 CC_PC_2_STDOUT=
     51CC_PC_2_STDOUT=-pc
    5452
    55 CXX_FLAGS=$(CC_FLAGS_OS) -zq -zl -bm -ze -w4 -dDEBUG -d2 -hc -zc $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     53CXX_FLAGS=-bt=os2v2 -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -d2 -hc -zc (_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    5654CXX_FLAGS_EXE=$(CXX_FLAGS)
    5755CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
    58 CXX_FLAGS_CRT=$(CXX_FLAGS) -bd -br
    5956CXX_FLAGS_SYS=$(CXX_FLAGS) -s -zdp -zff -zgf
    6057CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
    61 CXX_FLAGS_IFS=$(CXX_FLAGS_SYS)
     58CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) -bd
    6259CXX_OBJ_OUT=-fo=
    63 CXX_PC_2_STDOUT=
     60CXX_LST_OUT=
     61CXX_PC_2_STDOUT=-pc
    6462
    6563IMPLIB_FLAGS=/NOI /Nologo
    6664
    67 #TODO
    68 LINK_FLAGS=format WIndows NT RUntime CONsole option quiet, map
     65# TODO?
     66LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
    6967LINK_FLAGS_EXE=$(LINK_FLAGS)
    7068LINK_FLAGS_DLL=$(LINK_FLAGS)
    71 LINK_FLAGS_SYS=format os2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    72 LINK_FLAGS_VDD=format os2 virtdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    73 LINK_FLAGS_IFS=$(LINK_FLAGS_DLL)
     69LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
     70LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
     71LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
    7472LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
    7573LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
    … …  
    7775LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
    7876LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
    79 TARGET_OBJS1 = $(TARGET_OBJS:  = )
    80 LINK_LNK1=file $(TARGET_OBJS1: =^
    81 file )
    82 LINK_LNK2=libpath $(WATCOM)\lib386;$(WATCOM)\lib386\nt;
     77LINK_LNK1=file       $(TARGET_OBJS: =^
     78file       )
     79LINK_LNK2=libpath    $(WATCOM)\lib386\os2;$(WATCOM)\lib386;
    8380LINK_LNK3=option map=$(TARGET_MAP)
    84 LINK_LNK4=library $(TARGET_LIBS: =^, )
    85 LINK_LNK5=name $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
     81LINK_LNK4=library    $(TARGET_LIBS: =^, )
     82LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    8683
    8784RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
Note: See TracChangeset for help on using the changeset viewer.