Changeset 2068 for trunk/kBuild


Ignore:
Timestamp:
Nov 17, 2008, 2:18:09 AM (17 years ago)
Author:
bird
Message:

Open Watcom, some Watcom adjustments.

Location:
trunk/kBuild/tools
Files:
1 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/OPENWATCOM-16.kmk

    r2065 r2068  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Watcom C v11.0c, 16-bit targets.
     3# kBuild Tool Config - Open Watcom v1.4 and later, 16-bit targets.
    44#
    55# @remarks wrc is untested, so are DLLs, and programs.
    … …  
    3333#
    3434
    35 TOOL_WATCOMC11C-16 = Watcom C/C++ v11.0c - 16-bit targets.
    36 TOOL_WATCOMC11C-16_EXTENDS = WATCOMC11C
    37                                                
    38 TOOL_WATCOMC11C-16_COMPILE_C_DEPEND =
    39 TOOL_WATCOMC11C-16_COMPILE_C_DEPORD =
    40 TOOL_WATCOMC11C-16_COMPILE_C_OUTPUT = $(obj).err
    41 define TOOL_WATCOMC11C-16_COMPILE_C_CMDS
    42         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CC16) \
     35TOOL_OPENWATCOM-16 = Open Watcom v1.4 and later - 16-bit targets.
     36TOOL_OPENWATCOM-16_EXTENDS = OPENWATCOM
     37TOOL_OPENWATCOM-16_ASFLAGS.win  ?= -bt=windows
     38TOOL_OPENWATCOM-16_CFLAGS.win   ?= -bt=windows
     39TOOL_OPENWATCOM-16_CXXFLAGS.win ?= -bt=windows
     40TOOL_OPENWATCOM-16_RCFLAGS.win  ?= -bt=windows
     41TOOL_OPENWATCOM-16_LDFLAGS.win  ?= -bt=windows
     42
     43                                                       
     44TOOL_OPENWATCOM-16_COMPILE_C_DEPEND =
     45TOOL_OPENWATCOM-16_COMPILE_C_DEPORD =
     46TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT = $(obj).err
     47define TOOL_OPENWATCOM-16_COMPILE_C_CMDS
     48        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CC16) \
    4349                $(flags) \
    4450                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    5157endef
    5258
    53 TOOL_WATCOMC11C-16_COMPILE_CXX_DEPEND =
    54 TOOL_WATCOMC11C-16_COMPILE_CXX_DEPORD =
    55 TOOL_WATCOMC11C-16_COMPILE_CXX_OUTPUT = $(obj).err
    56 define TOOL_WATCOMC11C-16_COMPILE_CXX_CMDS
    57         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CXX16) \
     59TOOL_OPENWATCOM-16_COMPILE_CXX_DEPEND =
     60TOOL_OPENWATCOM-16_COMPILE_CXX_DEPORD =
     61TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT = $(obj).err
     62define TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS
     63        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CXX16) \
    5864                $(flags) \
    5965                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    6672endef
    6773
    68 TOOL_WATCOMC11C-16_COMPILE_RC_OUTPUT =
    69 TOOL_WATCOMC11C-16_COMPILE_RC_DEPEND =
    70 TOOL_WATCOMC11C-16_COMPILE_RC_DEPORD =
    71 define TOOL_WATCOMC11C-16_COMPILE_RC_CMDS
    72         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) \
    73                 $(TOOL_WATCOMC11C_RC) -r\
     74TOOL_OPENWATCOM-16_COMPILE_RC_OUTPUT =
     75TOOL_OPENWATCOM-16_COMPILE_RC_DEPEND =
     76TOOL_OPENWATCOM-16_COMPILE_RC_DEPORD =
     77define TOOL_OPENWATCOM-16_COMPILE_RC_CMDS
     78        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) \
     79                $(TOOL_OPENWATCOM_RC) -r\
    7480                $(flags) \
    7581                $(addprefix -i=, $(subst /,\\,$(incs))) \
    … …  
    7985endef
    8086
    81 TOOL_WATCOMC11C-16_LINK_LIBRARY_OUTPUT = ## @todo $(outbase).rsp
    82 TOOL_WATCOMC11C-16_LINK_LIBRARY_DEPEND = $(othersrc)
    83 TOOL_WATCOMC11C-16_LINK_LIBRARY_DEPORD =
    84 define TOOL_WATCOMC11C-16_LINK_LIBRARY_CMDS
     87TOOL_OPENWATCOM-16_LINK_LIBRARY_OUTPUT = ## @todo $(outbase).rsp
     88TOOL_OPENWATCOM-16_LINK_LIBRARY_DEPEND = $(othersrc)
     89TOOL_OPENWATCOM-16_LINK_LIBRARY_DEPORD =
     90define TOOL_OPENWATCOM-16_LINK_LIBRARY_CMDS
    8591        $(if $(strip $(othersrc)),\
    86                 $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) \
    87                 $(TOOL_WATCOMC11C_IMP) $(TOOL_WATCOMC11C_IMPFLAGS) $(subst /,\\,$(out)) $(subst /,\\,$(othersrc)) )
    88         $(if $(strip $(objs)),$(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) \
    89                 $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) \
    90                 $(TOOL_WATCOMC11C_AR) $(flags) $(subst /,\\,$(out)) $(foreach obj,$(subst /,\\,$(objs)),+"$(obj)") ";" )
     92                $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
     93                $(TOOL_OPENWATCOM_IMP) $(TOOL_OPENWATCOM_IMPFLAGS) $(subst /,\\,$(out)) $(subst /,\\,$(othersrc)) )
     94        $(if $(strip $(objs)),$(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
     95                $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
     96                $(TOOL_OPENWATCOM_AR) $(flags) $(subst /,\\,$(out)) $(foreach obj,$(subst /,\\,$(objs)),+"$(obj)") ";" )
    9197endef
    9298
    93 TOOL_WATCOMC11C-16_LINK_PROGRAM_OUTPUT = $(outbase).map
    94 TOOL_WATCOMC11C-16_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    95 TOOL_WATCOMC11C-16_LINK_PROGRAM_DEPORD =
    96 define TOOL_WATCOMC11C-16_LINK_PROGRAM_CMDS
    97         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
    98                 $(TOOL_WATCOMC11C_LD16) \
     99TOOL_OPENWATCOM-16_LINK_PROGRAM_OUTPUT = $(outbase).map
     100TOOL_OPENWATCOM-16_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     101TOOL_OPENWATCOM-16_LINK_PROGRAM_DEPORD =
     102define TOOL_OPENWATCOM-16_LINK_PROGRAM_CMDS
     103        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     104                $(TOOL_OPENWATCOM_LD16) \
    99105                $(flags) \
    100106                -fe=$(subst /,\\,$(out)) \
    … …  
    103109                $(subst /,\\,$(libs)) \
    104110                $(subst /,\\,$(othersrc))
    105         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \
    106                 $(TOOL_WATCOMC11C_RC) \
     111        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
     112                $(TOOL_OPENWATCOM_RC) \
    107113                        $(filter -bt=%,$(flags)) \
    108114                        /fe=$(subst /,\\,$(out)) \
    … …  
    110116endef
    111117
    112 TOOL_WATCOMC11C-16_LINK_DLL_OUTPUT = $(outbase).map
    113 TOOL_WATCOMC11C-16_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    114 TOOL_WATCOMC11C-16_LINK_DLL_DEPORD =
    115 define TOOL_WATCOMC11C-16_LINK_DLL_CMDS
    116         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
    117                 $(TOOL_WATCOMC11C_LD16) \
     118TOOL_OPENWATCOM-16_LINK_DLL_OUTPUT = $(outbase).map
     119TOOL_OPENWATCOM-16_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     120TOOL_OPENWATCOM-16_LINK_DLL_DEPORD =
     121define TOOL_OPENWATCOM-16_LINK_DLL_CMDS
     122        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     123                $(TOOL_OPENWATCOM_LD16) \
    118124                $(flags) \
    119125                -fe=$(subst /,\\,$(out)) \
    … …  
    122128                $(subst /,\\,$(libs)) \
    123129                $(subst /,\\,$(othersrc))
    124         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \
    125                 $(TOOL_WATCOMC11C_RC) \
     130        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
     131                $(TOOL_OPENWATCOM_RC) \
    126132                        $(filter -bt=%,$(flags)) \
    127133                        /fe=$(subst /,\\,$(out)) \
    … …  
    129135endef
    130136
    131 TOOL_WATCOMC11C-16_LINK_SYSMOD_OUTPUT = $(outbase).map
    132 TOOL_WATCOMC11C-16_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    133 TOOL_WATCOMC11C-16_LINK_SYSMOD_DEPORD =
    134 define TOOL_WATCOMC11C-16_LINK_SYSMOD_CMDS
    135         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
    136                 $(TOOL_WATCOMC11C_LD16) \
     137TOOL_OPENWATCOM-16_LINK_SYSMOD_OUTPUT = $(outbase).map
     138TOOL_OPENWATCOM-16_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     139TOOL_OPENWATCOM-16_LINK_SYSMOD_DEPORD =
     140define TOOL_OPENWATCOM-16_LINK_SYSMOD_CMDS
     141        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     142                $(TOOL_OPENWATCOM_LD16) \
    137143                $(flags) \
    138144                -fe=$(subst /,\\,$(out)) \
    … …  
    141147                $(subst /,\\,$(libs)) \
    142148                $(subst /,\\,$(othersrc))
    143         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \
    144                 $(TOOL_WATCOMC11C_RC) \
     149        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
     150                $(TOOL_OPENWATCOM_RC) \
    145151                        $(filter -bt=%,$(flags)) \
    146152                        /fe=$(subst /,\\,$(out)) \

  • trunk/kBuild/tools/OPENWATCOM.kmk

    r2065 r2068  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Watcom C v11.0c
     3# kBuild Tool Config - Open Watcom v1.4 and later.
    44#
    55
    … …  
    3232#
    3333
    34 TOOL_WATCOMC11C = Watcom C/C++ v11.0c (generic)
    35 
    36 ifeq ($(PATH_TOOL_WATCOMC11C),)
    37  ifeq ($(PATH_TOOL_WATCOMC11C),)
    38   PATH_TOOL_WATCOMC11C := $(wildcard $(PATH_DEVTOOLS_BLD)/watcom/v11.0c*)
    39  endif
    40  ifeq ($(PATH_TOOL_WATCOMC11C),)
    41   PATH_TOOL_WATCOMC11C := $(wildcard $(PATH_DEVTOOLS_TRG)/watcom/v11.0c*)
     34TOOL_OPENWATCOM = Open Watcom v1.4 and later (generic)
     35
     36ifeq ($(PATH_TOOL_OPENWATCOM),)
     37 ifeq ($(PATH_TOOL_OPENWATCOM),)
     38  PATH_TOOL_OPENWATCOM := $(wildcard $(PATH_DEVTOOLS_BLD)/openwatcom/v*)
     39 endif
     40 ifeq ($(PATH_TOOL_OPENWATCOM),)
     41  PATH_TOOL_OPENWATCOM := $(wildcard $(PATH_DEVTOOLS_BLD)/openwatcom/v*)
    4242 endif
    4343 if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
    44   PATH_TOOL_WATCOMC11C := $(wildcard d:/dev/Watcom/v11.0c*)
    45  endif
    46  PATH_TOOL_WATCOMC11C := $(firstword $(sort $(PATH_TOOL_WATCOMC11C)))
     44  PATH_TOOL_OPENWATCOM := $(wildcard d:/dev/Watcom/v1.*)
     45 endif
     46 PATH_TOOL_OPENWATCOM := $(firstword $(sort $(PATH_TOOL_OPENWATCOM)))
    4747 # if not found, we'll enter 'pathless' mode.
    4848else
    4949 # Resolve any fancy stuff once and for all.
    50  PATH_TOOL_WATCOMC11C := $(PATH_TOOL_WATCOMC11C)
     50 PATH_TOOL_OPENWATCOM := $(PATH_TOOL_OPENWATCOM)
    5151endif
    5252
    53 ifneq ($(PATH_TOOL_WATCOMC11C),)
    54  TOOL_WATCOMC11C_PATHLESS := no
     53ifneq ($(PATH_TOOL_OPENWATCOM),)
     54 TOOL_OPENWATCOM_PATHLESS := no
    5555
    5656 ifeq ($(KBUILD_HOST),os2)
    57   PATH_TOOL_WATCOMC11C_BIN   = $(PATH_TOOL_WATCOMC11C)/binp
    58   PATH_TOOL_WATCOMC11C_BIN2  = $(PATH_TOOL_WATCOMC11C)/binw
    59   TOOL_WATCOMC11C_ENV_SETUP ?= $(REDIRECT) \
    60         -E 'BEGINLIBPATH=$(PATH_TOOL_WATCOMC11C)/binp/dll;$(BEGINLIBPATH)' \
    61         -E 'PATH=$(PATH_TOOL_WATCOMC11C_BIN);$(PATH_TOOL_WATCOMC11C_BIN2)' \
    62         -E 'WATCOM=$(PATH_TOOL_WATCOMC11C)' \
     57  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binp
     58  TOOL_OPENWATCOM_ENV_SETUP ?= $(REDIRECT) \
     59        -E 'BEGINLIBPATH=$(PATH_TOOL_OPENWATCOM)/binp/dll;$(BEGINLIBPATH)' \
     60        -E 'PATH=$(PATH_TOOL_OPENWATCOM_BIN)' \
     61        -E 'WATCOM=$(PATH_TOOL_OPENWATCOM)' \
    6362        -E 'LIB=$1' \
    6463        -E 'INCLUDE=' \
    6564        --
    6665 else
    67   PATH_TOOL_WATCOMC11C_BIN   = $(PATH_TOOL_WATCOMC11C)/binnt
    68   PATH_TOOL_WATCOMC11C_BIN2  = $(PATH_TOOL_WATCOMC11C_BIN)
    69   TOOL_WATCOMC11C_ENV_SETUP ?= $(REDIRECT) \
    70         -E 'PATH=$(PATH_TOOL_WATCOMC11C_BIN)' \
    71         -E 'WATCOM=$(PATH_TOOL_WATCOMC11C)' \
     66  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binnt
     67  TOOL_OPENWATCOM_ENV_SETUP ?= $(REDIRECT) \
     68        -E 'PATH=$(PATH_TOOL_OPENWATCOM_BIN)' \
     69        -E 'WATCOM=$(PATH_TOOL_OPENWATCOM)' \
    7270        -E 'LIB=$1' \
    7371        -E 'INCLUDE=' \
    … …  
    7573 endif
    7674
    77  TOOL_WATCOMC11C_CC    ?= $(PATH_TOOL_WATCOMC11C_BIN)/wcc386$(HOSTSUFF_EXE)
    78  TOOL_WATCOMC11C_CC16  ?= $(PATH_TOOL_WATCOMC11C_BIN)/wcc$(HOSTSUFF_EXE)
    79  TOOL_WATCOMC11C_CXX   ?= $(PATH_TOOL_WATCOMC11C_BIN)/wpp386$(HOSTSUFF_EXE)
    80  TOOL_WATCOMC11C_CXX16 ?= $(PATH_TOOL_WATCOMC11C_BIN)/wpp$(HOSTSUFF_EXE)
    81  TOOL_WATCOMC11C_AS    ?= $(PATH_TOOL_WATCOMC11C_BIN)/wasm$(HOSTSUFF_EXE) TOOL_WATCOMC11C_AR    ?= $(PATH_TOOL_WATCOMC11C_BIN)/wlib$(HOSTSUFF_EXE)
    82  TOOL_WATCOMC11C_LD    ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wcl386$(HOSTSUFF_EXE)
    83  TOOL_WATCOMC11C_LD16  ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wcl$(HOSTSUFF_EXE)
    84  TOOL_WATCOMC11C_RC    ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wrc$(HOSTSUFF_EXE)
     75 TOOL_OPENWATCOM_CC    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wcc386$(HOSTSUFF_EXE)
     76 TOOL_OPENWATCOM_CC16  ?= $(PATH_TOOL_OPENWATCOM_BIN)/wcc$(HOSTSUFF_EXE)
     77 TOOL_OPENWATCOM_CXX   ?= $(PATH_TOOL_OPENWATCOM_BIN)/wpp386$(HOSTSUFF_EXE)
     78 TOOL_OPENWATCOM_CXX16 ?= $(PATH_TOOL_OPENWATCOM_BIN)/wpp$(HOSTSUFF_EXE)
     79 TOOL_OPENWATCOM_AS    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wasm$(HOSTSUFF_EXE)
     80 TOOL_OPENWATCOM_AR    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wlib$(HOSTSUFF_EXE)
     81 TOOL_OPENWATCOM_LD    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wcl386$(HOSTSUFF_EXE)
     82 TOOL_OPENWATCOM_LD16  ?= $(PATH_TOOL_OPENWATCOM_BIN)/wcl$(HOSTSUFF_EXE)
     83 TOOL_OPENWATCOM_RC    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wrc$(HOSTSUFF_EXE)
    8584
    8685else
    8786 # Pathless, relies on the environment.
    88  TOOL_WATCOMC11C_PATHLESS :=
    89  TOOL_WATCOMC11C_ENV_SETUP ?= $(REDIRECT) \
     87 TOOL_OPENWATCOM_PATHLESS :=
     88 TOOL_OPENWATCOM_ENV_SETUP ?= $(REDIRECT) \
    9089        -E 'LIB=$1' \
    9190        -E 'INCLUDE=' \
    9291        --
    93  TOOL_WATCOMC11C_CC    ?= wcc386$(HOSTSUFF_EXE)
    94  TOOL_WATCOMC11C_CC16  ?= wcc$(HOSTSUFF_EXE)
    95  TOOL_WATCOMC11C_CXX   ?= wpp386$(HOSTSUFF_EXE)
    96  TOOL_WATCOMC11C_CXX16 ?= wpp$(HOSTSUFF_EXE)
    97  TOOL_WATCOMC11C_AS    ?= wasm$(HOSTSUFF_EXE)
    98  TOOL_WATCOMC11C_AR    ?= wlib$(HOSTSUFF_EXE)
    99  TOOL_WATCOMC11C_LD    ?= wcl386$(HOSTSUFF_EXE)
    100  TOOL_WATCOMC11C_LD16  ?= wcl$(HOSTSUFF_EXE)
    101  TOOL_WATCOMC11C_RC    ?= wrc$(HOSTSUFF_EXE)
     92 TOOL_OPENWATCOM_CC    ?= wcc386$(HOSTSUFF_EXE)
     93 TOOL_OPENWATCOM_CC16  ?= wcc$(HOSTSUFF_EXE)
     94 TOOL_OPENWATCOM_CXX   ?= wpp386$(HOSTSUFF_EXE)
     95 TOOL_OPENWATCOM_CXX16 ?= wpp$(HOSTSUFF_EXE)
     96 TOOL_OPENWATCOM_AS    ?= wasm$(HOSTSUFF_EXE)
     97 TOOL_OPENWATCOM_AR    ?= wlib$(HOSTSUFF_EXE)
     98 TOOL_OPENWATCOM_LD    ?= wcl386$(HOSTSUFF_EXE)
     99 TOOL_OPENWATCOM_LD16  ?= wcl$(HOSTSUFF_EXE)
     100 TOOL_OPENWATCOM_RC    ?= wrc$(HOSTSUFF_EXE)
    102101                                                                                       
    103102endif
    104103                                                       
    105104# General Properties used by kBuild
    106 TOOL_WATCOMC11C_COBJSUFF         ?= .obj
    107 TOOL_WATCOMC11C_CFLAGS           ?= -zq
    108 TOOL_WATCOMC11C_CFLAGS.os2       ?= -bt=os2
    109 TOOL_WATCOMC11C_CFLAGS.win       ?= -bt=nt
    110 TOOL_WATCOMC11C_CFLAGS.debug     ?=
    111 TOOL_WATCOMC11C_CFLAGS.release   ?=
    112 TOOL_WATCOMC11C_CINCS            ?= $(PATH_TOOL_WATCOMC11C)/h
    113 TOOL_WATCOMC11C_CDEFS            ?=
    114 
    115 TOOL_WATCOMC11C_CXXOBJSUFF       ?= .obj
    116 TOOL_WATCOMC11C_CXXFLAGS         ?= -zq
    117 TOOL_WATCOMC11C_CXXFLAGS.os2     ?= -bt=os2
    118 TOOL_WATCOMC11C_CXXFLAGS.win     ?= -bt=nt
    119 TOOL_WATCOMC11C_CXXFLAGS.debug   ?=
    120 TOOL_WATCOMC11C_CXXFLAGS.release ?=
    121 TOOL_WATCOMC11C_CXXINCS          ?= $(PATH_TOOL_WATCOMC11C)/h
    122 TOOL_WATCOMC11C_CXXDEFS          ?=
    123 
    124 TOOL_WATCOMC11C_RCOBJSUFF        ?= .res
    125 TOOL_WATCOMC11C_RCFLAGS          ?= -r
    126 TOOL_WATCOMC11C_RCINCS           ?= $(PATH_TOOL_WATCOMC11C)/h
    127 TOOL_WATCOMC11C_RCDEFS           ?=
    128 
    129 TOOL_WATCOMC11C_ARFLAGS          ?=
    130 TOOL_WATCOMC11C_ARLIBSUFF        ?= .lib
    131 
    132 TOOL_WATCOMC11C_LDFLAGS          ?= -zq -y
    133 TOOL_WATCOMC11C_LDFLAGS.os2      ?= -bt=os2
    134 TOOL_WATCOMC11C_LDFLAGS.win      ?= -bt=nt
    135 TOOL_WATCOMC11C_LDFLAGS.debug    ?=
    136 
    137 
    138 TOOL_WATCOMC11C_COMPILE_C_DEPEND =
    139 TOOL_WATCOMC11C_COMPILE_C_DEPORD =
    140 TOOL_WATCOMC11C_COMPILE_C_OUTPUT = $(obj).err
    141 define TOOL_WATCOMC11C_COMPILE_C_CMDS
    142         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CC) \
     105TOOL_OPENWATCOM_COBJSUFF         ?= .obj
     106TOOL_OPENWATCOM_CFLAGS           ?= -zq
     107TOOL_OPENWATCOM_CFLAGS.os2       ?= -bt=os2
     108TOOL_OPENWATCOM_CFLAGS.win       ?= -bt=nt
     109TOOL_OPENWATCOM_CFLAGS.debug     ?=
     110TOOL_OPENWATCOM_CFLAGS.release   ?=
     111TOOL_OPENWATCOM_CINCS            ?= $(PATH_TOOL_OPENWATCOM)/h
     112TOOL_OPENWATCOM_CDEFS            ?=
     113
     114TOOL_OPENWATCOM_CXXOBJSUFF       ?= .obj
     115TOOL_OPENWATCOM_CXXFLAGS         ?= -zq
     116TOOL_OPENWATCOM_CXXFLAGS.os2     ?= -bt=os2
     117TOOL_OPENWATCOM_CXXFLAGS.win     ?= -bt=nt
     118TOOL_OPENWATCOM_CXXFLAGS.debug   ?=
     119TOOL_OPENWATCOM_CXXFLAGS.release ?=
     120TOOL_OPENWATCOM_CXXINCS          ?= $(PATH_TOOL_OPENWATCOM)/h
     121TOOL_OPENWATCOM_CXXDEFS          ?=
     122
     123TOOL_OPENWATCOM_RCOBJSUFF        ?= .res
     124TOOL_OPENWATCOM_RCFLAGS          ?= -r
     125TOOL_OPENWATCOM_RCFLAGS.os2      ?= -bt=os2
     126TOOL_OPENWATCOM_RCFLAGS.win      ?= -bt=nt
     127TOOL_OPENWATCOM_RCINCS           ?= $(PATH_TOOL_OPENWATCOM)/h
     128TOOL_OPENWATCOM_RCDEFS           ?=
     129
     130TOOL_OPENWATCOM_ARFLAGS          ?=
     131TOOL_OPENWATCOM_ARLIBSUFF        ?= .lib
     132
     133TOOL_OPENWATCOM_LDFLAGS          ?= -zq -y
     134TOOL_OPENWATCOM_LDFLAGS.os2      ?= -bt=os2
     135TOOL_OPENWATCOM_LDFLAGS.win      ?= -bt=nt
     136TOOL_OPENWATCOM_LDFLAGS.debug    ?=
     137
     138
     139TOOL_OPENWATCOM_COMPILE_C_DEPEND =
     140TOOL_OPENWATCOM_COMPILE_C_DEPORD =
     141TOOL_OPENWATCOM_COMPILE_C_OUTPUT = $(obj).err
     142define TOOL_OPENWATCOM_COMPILE_C_CMDS
     143        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CC) \
    143144                $(flags) \
    144145                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    151152endef
    152153
    153 TOOL_WATCOMC11C_COMPILE_CXX_DEPEND =
    154 TOOL_WATCOMC11C_COMPILE_CXX_DEPORD =
    155 TOOL_WATCOMC11C_COMPILE_CXX_OUTPUT = $(obj).err
    156 define TOOL_WATCOMC11C_COMPILE_CXX_CMDS
    157         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CXX) \
     154TOOL_OPENWATCOM_COMPILE_CXX_DEPEND =
     155TOOL_OPENWATCOM_COMPILE_CXX_DEPORD =
     156TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT = $(obj).err
     157define TOOL_OPENWATCOM_COMPILE_CXX_CMDS
     158        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CXX) \
    158159                $(flags) \
    159160                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    166167endef
    167168
    168 TOOL_WATCOMC11C_COMPILE_RC_OUTPUT =
    169 TOOL_WATCOMC11C_COMPILE_RC_DEPEND =
    170 TOOL_WATCOMC11C_COMPILE_RC_DEPORD =
    171 define TOOL_WATCOMC11C_COMPILE_RC_CMDS
    172         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) \
    173                 $(TOOL_WATCOMC11C_RC) -r\
     169TOOL_OPENWATCOM_COMPILE_RC_OUTPUT =
     170TOOL_OPENWATCOM_COMPILE_RC_DEPEND =
     171TOOL_OPENWATCOM_COMPILE_RC_DEPORD =
     172define TOOL_OPENWATCOM_COMPILE_RC_CMDS
     173        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) \
     174                $(TOOL_OPENWATCOM_RC) -r\
    174175                $(flags) \
    175176                $(addprefix -i=, $(subst /,\\,$(incs))) \
    … …  
    179180endef
    180181
    181 TOOL_WATCOMC11C_LINK_LIBRARY_OUTPUT = ## @todo $(outbase).rsp
    182 TOOL_WATCOMC11C_LINK_LIBRARY_DEPEND = $(othersrc)
    183 TOOL_WATCOMC11C_LINK_LIBRARY_DEPORD =
    184 define TOOL_WATCOMC11C_LINK_LIBRARY_CMDS
     182TOOL_OPENWATCOM_LINK_LIBRARY_OUTPUT = ## @todo $(outbase).rsp
     183TOOL_OPENWATCOM_LINK_LIBRARY_DEPEND = $(othersrc)
     184TOOL_OPENWATCOM_LINK_LIBRARY_DEPORD =
     185define TOOL_OPENWATCOM_LINK_LIBRARY_CMDS
    185186        $(if $(strip $(othersrc)),\
    186                 $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) \
    187                 $(TOOL_WATCOMC11C_IMP) $(TOOL_WATCOMC11C_IMPFLAGS) $(subst /,\\,$(out)) $(subst /,\\,$(othersrc)) )
    188         $(if $(strip $(objs)),$(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) \
    189                 $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) \
    190                 $(TOOL_WATCOMC11C_AR) $(flags) $(subst /,\\,$(out)) $(foreach obj,$(subst /,\\,$(objs)),+"$(obj)") ";" )
    191 endef
    192 
    193 TOOL_WATCOMC11C_LINK_PROGRAM_OUTPUT = $(outbase).map
    194 TOOL_WATCOMC11C_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    195 TOOL_WATCOMC11C_LINK_PROGRAM_DEPORD =
    196 define TOOL_WATCOMC11C_LINK_PROGRAM_CMDS
    197         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
    198                 $(TOOL_WATCOMC11C_LD) \
     187                $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
     188                $(TOOL_OPENWATCOM_IMP) $(TOOL_OPENWATCOM_IMPFLAGS) $(subst /,\\,$(out)) $(subst /,\\,$(othersrc)) )
     189        $(if $(strip $(objs)),$(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
     190                $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
     191                $(TOOL_OPENWATCOM_AR) $(flags) $(subst /,\\,$(out)) $(foreach obj,$(subst /,\\,$(objs)),+"$(obj)") ";" )
     192endef
     193
     194TOOL_OPENWATCOM_LINK_PROGRAM_OUTPUT = $(outbase).map
     195TOOL_OPENWATCOM_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     196TOOL_OPENWATCOM_LINK_PROGRAM_DEPORD =
     197define TOOL_OPENWATCOM_LINK_PROGRAM_CMDS
     198        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     199                $(TOOL_OPENWATCOM_LD) \
    199200                $(flags) \
    200201                -fe=$(subst /,\\,$(out)) \
    … …  
    203204                $(subst /,\\,$(libs)) \
    204205                $(subst /,\\,$(othersrc))
    205         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \
    206                 $(TOOL_WATCOMC11C_RC) \
     206        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
     207                $(TOOL_OPENWATCOM_RC) \
    207208                        $(filter -bt=%,$(flags)) \
    208209                        /fe=$(subst /,\\,$(out)) \
    … …  
    210211endef
    211212
    212 TOOL_WATCOMC11C_LINK_DLL_OUTPUT = $(outbase).map
    213 TOOL_WATCOMC11C_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    214 TOOL_WATCOMC11C_LINK_DLL_DEPORD =
    215 define TOOL_WATCOMC11C_LINK_DLL_CMDS
    216         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
    217                 $(TOOL_WATCOMC11C_LD) \
     213TOOL_OPENWATCOM_LINK_DLL_OUTPUT = $(outbase).map
     214TOOL_OPENWATCOM_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     215TOOL_OPENWATCOM_LINK_DLL_DEPORD =
     216define TOOL_OPENWATCOM_LINK_DLL_CMDS
     217        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     218                $(TOOL_OPENWATCOM_LD) \
    218219                $(flags) \
    219220                -fe=$(subst /,\\,$(out)) \
    … …  
    222223                $(subst /,\\,$(libs)) \
    223224                $(subst /,\\,$(othersrc))
    224         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \
    225                 $(TOOL_WATCOMC11C_RC) \
     225        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
     226                $(TOOL_OPENWATCOM_RC) \
    226227                        $(filter -bt=%,$(flags)) \
    227228                        /fe=$(subst /,\\,$(out)) \
    … …  
    229230endef
    230231
    231 TOOL_WATCOMC11C_LINK_SYSMOD_OUTPUT = $(outbase).map
    232 TOOL_WATCOMC11C_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    233 TOOL_WATCOMC11C_LINK_SYSMOD_DEPORD =
    234 define TOOL_WATCOMC11C_LINK_SYSMOD_CMDS
    235         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
    236                 $(TOOL_WATCOMC11C_LD) \
     232TOOL_OPENWATCOM_LINK_SYSMOD_OUTPUT = $(outbase).map
     233TOOL_OPENWATCOM_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     234TOOL_OPENWATCOM_LINK_SYSMOD_DEPORD =
     235define TOOL_OPENWATCOM_LINK_SYSMOD_CMDS
     236        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     237                $(TOOL_OPENWATCOM_LD) \
    237238                $(flags) \
    238239                -fe=$(subst /,\\,$(out)) \
    … …  
    241242                $(subst /,\\,$(libs)) \
    242243                $(subst /,\\,$(othersrc))
    243         $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \
    244                 $(TOOL_WATCOMC11C_RC) \
     244        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
     245                $(TOOL_OPENWATCOM_RC) \
    245246                        $(filter -bt=%,$(flags)) \
    246247                        /fe=$(subst /,\\,$(out)) \
    … …  
    248249endef
    249250
    250 

  • trunk/kBuild/tools/WATCOMC11C-16.kmk

    r2065 r2068  
    3535TOOL_WATCOMC11C-16 = Watcom C/C++ v11.0c - 16-bit targets.
    3636TOOL_WATCOMC11C-16_EXTENDS = WATCOMC11C
     37TOOL_WATCOMC11C-16_ASFLAGS.win  ?= -bt=windows
     38TOOL_WATCOMC11C-16_CFLAGS.win   ?= -bt=windows
     39TOOL_WATCOMC11C-16_CXXFLAGS.win ?= -bt=windows
     40TOOL_WATCOMC11C-16_RCFLAGS.win  ?= -bt=windows
     41TOOL_WATCOMC11C-16_LDFLAGS.win  ?= -bt=windows
    3742                                               
    3843TOOL_WATCOMC11C-16_COMPILE_C_DEPEND =
Note: See TracChangeset for help on using the changeset viewer.