Changeset 9165


Ignore:
Timestamp:
Aug 29, 2002, 12:01:46 PM (23 years ago)
Author:
bird
Message:

Added new tools. Restructured tools. More options. Fixes.

Location:
trunk/make
Files:
12 added
30 edited

Legend:

Unmodified
Added
Removed

  • trunk/make/process.forwarder.mak

    r9134 r9165  
    1 # $Id: process.forwarder.mak,v 1.12 2002-08-27 02:59:42 bird Exp $
     1# $Id: process.forwarder.mak,v 1.13 2002-08-29 10:01:39 bird Exp $
    22
    33#
    … …  
    187187$(TARGET_ILIB) \
    188188$(RULES_FORWARD) \
    189 install testcase nothing target:
     189publish publish_target testcase nothing target:
    190190    \
    191191!ifndef BUILD_VERBOSE

  • trunk/make/process.mak

    r9135 r9165  
    1 # $Id: process.mak,v 1.24 2002-08-27 03:01:01 bird Exp $
     1# $Id: process.mak,v 1.25 2002-08-29 10:01:40 bird Exp $
    22
    33#
    … …  
    436436_SRC = $(PATH_CURRENT)\$<
    437437!endif
     438_DST = $(PATH_TARGET)\$(@F)
    438439
    439440
    … …  
    446447! endif
    447448!if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
    448     $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$@
    449 !else
    450     $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$@
     449! ifdef AS_CMD_SYS
     450    $(TOOL_JOB_SUB) $(AS_CMD_SYS)
     451! else
     452    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
     453! endif
     454!else
     455! ifdef AS_CMD
     456    $(TOOL_JOB_SUB) $(AS_CMD)
     457! else
     458    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
     459! endif
    451460!endif
    452461
    … …  
    458467!endif
    459468!if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
    460     $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
    461 !else
    462     $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
     469! ifdef AS_CMD_SYS
     470    $(AS_CMD_SYS)
     471! else
     472    $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
     473! endif
     474!else
     475! ifdef AS_CMD
     476    $(AS_CMD)
     477! else
     478    $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
     479! endif
    463480!endif
    464481
    … …  
    489506        $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
    490507!endif
    491         $(CXX_OBJ_OUT)$@ $(_SRC)
     508        $(CXX_OBJ_OUT)$(_DST) $(_SRC)
    492509
    493510.cpp.$(EXT_OBJ):
    … …  
    501518        $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
    502519!endif
    503         $(CXX_OBJ_OUT)$(PATH_TARGET)\$(@F) $(_SRC)
     520        $(CXX_OBJ_OUT)$(_DST) $(_SRC)
    504521
    505522
    … …  
    555572        $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
    556573!endif
    557         $(CC_OBJ_OUT)$@ $(_SRC)
     574        $(CC_OBJ_OUT)$(_DST) $(_SRC)
    558575
    559576.c.$(EXT_OBJ):
    … …  
    567584        $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
    568585!endif
    569         $(CC_OBJ_OUT)$(PATH_TARGET)\$(@F) $(_SRC)
     586        $(CC_OBJ_OUT)$(_DST) $(_SRC)
    570587
    571588
    … …  
    601618    @ \
    602619!endif
    603     $(TOOL_JOB_SUB) $(RC) $(RC_FLAGS) $(_SRC) $@
     620    $(TOOL_JOB_SUB) $(RC) $(RC_FLAGS) $(_SRC) $(_DST)
    604621
    605622.rc.res:
    … …  
    609626    @ \
    610627!endif
    611     $(RC) $(RC_FLAGS) $(_SRC) $(PATH_TARGET)\$(@F)
     628    $(RC) $(RC_FLAGS) $(_SRC) $(_DST)
    612629
    613630
    … …  
    624641    @ \
    625642!endif
    626     $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
     643    $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(_DST)
    627644
    628645.orc.obj:
    … …  
    637654    @ \
    638655!endif
    639     $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
     656    $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(_DST)
    640657
    641658

  • trunk/make/setup.mak

    r9150 r9165  
    1 # $Id: setup.mak,v 1.15 2002-08-28 03:47:09 bird Exp $
     1# $Id: setup.mak,v 1.16 2002-08-29 10:01:40 bird Exp $
    22
    33#
    … …  
    130130PATH_INCLUDES   = $(PATH_ROOT)\include\win;.;$(PATH_ROOT)\include
    131131# Where the temporary files goes.
    132 PATH_OBJ        = $(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENV)
     132PATH_OBJ        = $(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENV:-=_)
    133133# Where the libraries goes.
    134134PATH_LIB        = $(PATH_ROOT)\lib\$(BUILD_MODE)
    … …  
    206206MAKE_INCLUDE_PROCESS    = $(PATH_MAKE)\process.mak
    207207
     208# -----------------------------------------------------------------------------
     209# Build the environments variables
     210# -----------------------------------------------------------------------------
     211
     212# In the makefiles you're allowed to use the BUILD_ENVS_PRE,
     213# BUILD_ENV_FORCE, BUILD_ENVS_POST variables to make private changes to the
     214# environment. These are combined with the two base ones as follows:
     215#   $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
     216#
     217# BUILD_ENV_FORCE is used for changing the base compiler. Do *NOT* use
     218# BUILD_ENV for that! BUILD_ENV_FORCE isn't used directly but in the setup
     219# string above, but ENV_ENVS from the setup.[w]xyz.mk setup file is used.
     220#
     221
     222# These strings are passed on to the BuildEnv.cmd script to setup the correct
     223# shell environment.
     224# TODO   Should these be overridable by setup.[w]xyz.mak ? (kso)
     225BUILD_ENVS_BASE_POST    = toolkit40
     226BUILD_ENVS_BASE_POST_16 =
     227BUILD_ENVS_BASE_PRE     = buildsetup emx cvs
     228BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit40 ddkbase
     229
    208230
    209231# -----------------------------------------------------------------------------
    … …  
    279301#
    280302
    281 # -----------------------------------------------------------------------------
    282 # Build the environments
    283 # -----------------------------------------------------------------------------
    284 
    285 # In the makefiles you're allowed to use the BUILD_ENVS_PRE,
    286 # BUILD_ENV_FORCE, BUILD_ENVS_POST variables to make private changes to the
    287 # environment. These are combined with the two base ones as follows:
    288 #   $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
    289 #
    290 # BUILD_ENV_FORCE is used for changing the base compiler. Do *NOT* use
    291 # BUILD_ENV for that! BUILD_ENV_FORCE isn't used directly but in the setup
    292 # string above, but ENV_ENVS from the setup.[w]xyz.mk setup file is used.
    293 #
    294 
    295 # These strings are passed on to the BuildEnv.cmd script to setup the correct
    296 # shell environment.
    297 # TODO   Should these be overridable by setup.[w]xyz.mak ? (kso)
    298 
    299 BUILD_ENVS_BASE_POST    = toolkit40
    300 BUILD_ENVS_BASE_POST_16 =
    301 BUILD_ENVS_BASE_PRE     = buildsetup emx cvs
    302 BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit40 ddkbase
    303 
    304 #
     303
     304# -----------------------------------------------------------------------------
    305305# Forwarding processing.
    306 #
     306# -----------------------------------------------------------------------------
    307307!if $(BUILD_FORWARDING)
    308308

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

    r9139 r9165  
    1 # $Id: setup.optional.alp.mk,v 1.3 2002-08-27 04:21:00 bird Exp $
     1# $Id: setup.optional.alp.mk,v 1.4 2002-08-29 10:01:40 bird Exp $
    22
    33#
    … …  
    55#
    66
    7 !if "$(AS_MODE)" != ""
     7!ifdef AS_MODE
    88_AS_MODE =
    9 ! if "$(AS_MODE)" != "ALP"
     9! if "$(AS_MODE)" == "ALP"
    1010_AS_MODE = -Sv:ALP
    1111! endif
    12 ! if "$(AS_MODE)" != "M510"
     12! if "$(AS_MODE)" == "M510"
    1313_AS_MODE = -Sv:M510
    1414! endif
    15 ! if "$(AS_MODE)" != "M600"
     15! if "$(AS_MODE)" == "M600"
    1616_AS_MODE = -Sv:M600
    1717! endif
    18 ! if "$(AS_MODE)" != ""
     18! if "$(_AS_MODE)" == ""
    1919!  if [$(ECHO) $(CLRERR)Error: Bad AS_MODE ($(AS_MODE)). Valid modes are ALP, M510 and M600.$(CLRRST)]
    2020!  endif

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

    r9119 r9165  
    1 # $Id: setup.optional.vac3xx.mk,v 1.3 2002-08-24 04:58:14 bird Exp $
     1# $Id: setup.optional.vac3xx.mk,v 1.4 2002-08-29 10:01:41 bird Exp $
    22
    33#
    … …  
    1111# C Compiler flags.
    1212#
    13 _CC_SEG_TEXT     =
    14 _CC_SEG_DATA     =
    15 _CC_SEG_XCPT     =
    16 _CC_DEFAULT_LIBS = /Gn+
    17 _CC_PACK         =
    18 _CC_MODEL        =
     13_CC_SEG_TEXT    =
     14_CC_SEG_DATA    =
     15_CC_SEG_XCPT    =
     16_CC_DEFAULT_LIBS= /Gn+
     17_CC_PACK        =
     18_CC_MODEL       =
    1919!if "$(BUILD_MODE)" == "DEBUG"
    20 _CC_DBGMEM       = /Tm+
     20_CC_DBGMEM      = /Tm+
    2121!else
    22 _CC_DBGMEM       = /Tm-
     22_CC_DBGMEM      = /Tm-
    2323!endif
     24_CC_RING0       =
     25_CC_RUNTIME     =
     26_CC_CALLING     =
    2427
    2528!ifdef ALL_SEG_TEXT
    … …  
    5457_CXX_DBGMEM      = /Tm-
    5558!endif
     59!if defined(CC_RING0) || defined(ALL_RING0)
     60_CC_RING0       = /Gr+
     61!endif
     62!if defined(CC_NO_RING0) || defined(ALL_NO_RING0)
     63_CC_RING0       = /Gr-
     64!endif
     65!if defined(CC_CRT) || defined(ALL_CRT)
     66_CC_RUNTIME     = /Re
     67!endif
     68!if defined(CC_NO_CRT) || defined(ALL_NO_CRT)
     69_CC_RUNTIME     = /Rn
     70!endif
     71!if defined(CC_CALLING_SYSTEM) || defined(ALL_CALLING_SYSTEM)
     72_CC_CALLING     = /Ms+
     73!endif
     74!if defined(CC_CALLING_CDECL) || defined(ALL_CALLING_CDECL)
     75_CC_CALLING     = /Mc+
     76!endif
     77!if defined(CC_CALLING_STDCALL) || defined(ALL_CALLING_STDCALL)
     78_CC_CALLING     = /Mt+
     79!endif
     80!if defined(CC_CALLING_OPTLINK) || defined(ALL_CALLING_OPTLINK)
     81_CC_CALLING     = /Mp+
     82!endif
    5683
    57 _CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL) $(_CC_DBGMEM)
     84
     85_CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL) $(_CC_DBGMEM) $(_CC_RING0) $(_CC_RUNTIME)
    5886
    5987
    … …  
    6290# C++ Compiler flags.
    6391#
    64 _CXX_SEG_TEXT     =
    65 _CXX_SEG_DATA     =
    66 _CXX_SEG_XCPT     =
     92_CXX_SEG_TEXT   =
     93_CXX_SEG_DATA   =
     94_CXX_SEG_XCPT   =
    6795_CXX_DEFAULT_LIBS = /Gn+
    68 _CXX_PACK         =
    69 _CXX_XCPT         = /Gx+
    70 _CXX_MODEL        =
     96_CXX_PACK       =
     97_CXX_XCPT       = /Gx+
     98_CXX_MODEL      =
    7199!if "$(BUILD_MODE)" == "DEBUG"
    72 _CXX_DBGMEM       = /Tm+
     100_CXX_DBGMEM     = /Tm+
    73101!else
    74 _CXX_DBGMEM       = /Tm-
     102_CXX_DBGMEM     = /Tm-
    75103!endif
     104_CXX_RING0      =
     105_CXX_RUNTIME    =
     106_CXX_CALLING    =
    76107
    77108!ifdef ALL_SEG_TEXT
    … …  
    97128!endif
    98129!ifdef ALL_PACK
    99 _CXX_PACK         = /Sp$(ALL_PACK)
     130_CXX_PACK       = /Sp$(ALL_PACK)
    100131!endif
    101132!ifdef CXX_PACK
    102 _CXX_PACK         = /Sp$(CXX_PACK)
     133_CXX_PACK       = /Sp$(CXX_PACK)
    103134!endif
    104135!ifdef CXX_XCPT
    105 _CXX_XCPT         = /Gx-
     136_CXX_XCPT       = /Gx-
    106137!endif
    107138!ifdef CXX_NO_XCPT
    108 _CXX_XCPT         = /Gx+
     139_CXX_XCPT       = /Gx+
    109140!endif
    110141!if defined(CXX_MODEL) || defined(ALL_MODEL)
    … …  
    113144!endif
    114145!if defined(CXX_DBGMEM) || defined(ALL_DBGMEM)
    115 _CXX_DBGMEM      = /Tm+
     146_CXX_DBGMEM     = /Tm+
    116147!endif
    117148!if defined(CXX_NO_DBGMEM) || defined(ALL_NO_DBGMEM)
    118 _CXX_DBGMEM      = /Tm-
     149_CXX_DBGMEM     = /Tm-
     150!endif
     151!if defined(CXX_RING0) || defined(ALL_RING0)
     152_CXX_RING0      = /Gr+
     153!endif
     154!if defined(CXX_NO_RING0) || defined(ALL_NO_RING0)
     155_CXX_RING0      = /Gr-
     156!endif
     157!if defined(CXX_CRT) || defined(ALL_CRT)
     158_CXX_RUNTIME    = /Re
     159!endif
     160!if defined(CXX_NO_CRT) || defined(ALL_NO_CRT)
     161_CXX_RUNTIME    = /Rn
     162!endif
     163!if defined(CXX_CALLING_SYSTEM) || defined(ALL_CALLING_SYSTEM)
     164_CXX_CALLING    = /Ms+
     165!endif
     166!if defined(CXX_CALLING_CDECL) || defined(ALL_CALLING_CDECL)
     167_CXX_CALLING    = /Mc+
     168!endif
     169!if defined(CXX_CALLING_STDCALL) || defined(ALL_CALLING_STDCALL)
     170_CXX_CALLING    = /Mt+
     171!endif
     172!if defined(CXX_CALLING_OPTLINK) || defined(ALL_CALLING_OPTLINK)
     173_CXX_CALLING    = /Mp+
    119174!endif
    120175
     176_CXX_OPTIONAL = $(_CXX_SEG_TEXT) $(_CXX_SEG_DATA) $(_CXX_SEG_XCPT) $(_CXX_DEFAULT_LIBS) $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) $(_CXX_DBGMEM) $(_CXX_RING0) $(_CXX_RUNTIME) $(_CXX_CALLING)
    121177
    122 _CXX_OPTIONAL = $(_CXX_SEG_TEXT) $(_CXX_SEG_DATA) $(_CXX_SEG_XCPT) $(_CXX_DEFAULT_LIBS) $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) $(_CXX_DBGMEM)
    123 

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

    r9153 r9165  
    1 # $Id: setup.optional.watcom11x.mk,v 1.5 2002-08-28 04:42:04 bird Exp $
     1# $Id: setup.optional.watcom11x.mk,v 1.6 2002-08-29 10:01:41 bird Exp $
    22
    33#
    … …  
    1111# C Compiler flags.
    1212#
    13 _CC_SEG_TEXT     =
    14 _CC_SEG_DATA     =
    15 _CC_SEG_XCPT     =
    16 _CC_DEFAULT_LIBS = -zl
    17 _CC_PACK         =
     13_CC_SEG_TEXT    =
     14_CC_SEG_DATA    =
     15_CC_SEG_XCPT    =
     16_CC_SEG_TEXT_CLASS=
     17_CC_DEFAULT_LIBS= -zl
     18_CC_PACK        =
    1819!ifdef ENV_16BIT
    19 _CC_MODEL        = -ms
    20 _OBJ_MODEL       = s
    21 _CC_DEF_MODEL    = SMALL
    22 !else
    23 _CC_MODEL        = -mf
    24 _CC_DEF_MODEL    = FLAT
    25 !endif
    26 _CC_OPT_R        =
     20_CC_MODEL       = -ms
     21_OBJ_MODEL      = s
     22_CC_DEF_MODEL   = SMALL
     23!else
     24_CC_MODEL       = -mf
     25_CC_DEF_MODEL   = FLAT
     26!endif
     27_CC_OPT_R       =
     28_CC_O_INLINE_USER =
     29_CC_O_FRAMES=
     30_CC_O_O2    =
     31_CC_O_INLINE=
     32_CC_O_SIZE  =
     33_CC_O_TIME  =
     34_CC_O_DISABLE =
     35_CC_O_X     =
     36!if "$(BUILD_MODE)" == "RELEASE"
     37! ifdef ENV_16BIT
     38_CC_O_CPU   = -5
     39!else
     40_CC_O_CPU   = -5r
     41!endif
     42!endif
    2743
    2844!ifdef ALL_SEG_TEXT
    … …  
    3753!ifdef CC_SEG_DATA
    3854_CC_SEG_DATA=-nd=$(CC_SEG_TEXT)
     55!endif
     56!ifdef ALL_SEG_TEXT_CLASS
     57_CC_SEG_TEXT_CLASS =-nc=$(ALL_SEG_TEXT_CLASS)
     58!endif
     59!ifdef CC_SEG_TEXT_CLASS
     60_CC_SEG_TEXT_CLASS =-nc=$(CC_SEG_TEXT_CLASS)
    3961!endif
    4062!if defined(CC_DEFAULT_LIBS) || defined(ALL_DEFAULT_LIBS)
    … …  
    104126!endif
    105127
     128# watcom options.
    106129!if defined(CC_SAVE_SEGS_ACCROSS_CALLS) || defined(ALL_SAVE_SEGS_ACCROSS_CALLS)
    107130_CC_OPT_R = -r
    108131!endif
    109 _CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL) -d$(_CC_DEF_MODEL) \
    110                $(_CC_OPT_R)
     132
     133# watcom optimizations.
     134!if !defined(ALL_NO_O) && !defined(CC_NO_O)
     135! if defined(ALL_O_INLINE_USER)
     136_CC_O_INLINE_USER = -e=$(ALL_O_INLINE_USER)
     137! endif
     138! if defined(CC_O_INLINE_USER)
     139_CC_O_INLINE_USER = -e=$(CC_O_INLINE_USER)
     140! endif
     141! if defined(CC_O_FRAMES) || defined(ALL_O_FRAMES)
     142_CC_O_FRAMES=f+
     143! endif
     144! if defined(CC_O_O2)     || defined(ALL_O_O2)
     145_CC_O_O2    =h
     146! endif
     147! if defined(CC_O_INLINE) || defined(ALL_O_INLINE)
     148_CC_O_INLINE=i
     149! endif
     150! if defined(CC_O_SIZE)   || defined(ALL_O_SIZE)
     151_CC_O_SIZE  =s
     152! endif
     153! if defined(CC_O_TIME)   || defined(ALL_O_TIME)
     154_CC_O_TIME  =t
     155! endif
     156! if defined(CC_O_X)   || defined(ALL_O_X)
     157_CC_O_X  =x
     158! endif
     159!else
     160_CC_O_DISABLE=d
     161!endif
     162
     163_CC_OPTIM = -o$(_CC_O_DISABLE)$(_CC_O_O2)$(_CC_O_INLINE)$(_CC_O_SIZE)$(_CC_O_TIME)$(_CC_O_X)$(_CC_O_FRAMES)$(_CC_O_INLINE_USER)
     164!if "$(_CC_OPTIM)" == "-o"
     165_CC_OPTIM =
     166!endif
     167
     168!if defined(ALL_O_CPU)
     169! ifdef ENV_16BIT
     170_CC_O_CPU   = -$(ALL_O_CPU)
     171! else
     172_CC_O_CPU   = -$(ALL_O_CPU)r
     173! endif
     174!endif
     175!if defined(CC_O_CPU)
     176! ifdef ENV_16BIT
     177_CC_O_CPU   = -$(CC_O_CPU)
     178! else
     179_CC_O_CPU   = -$(CC_O_CPU)r
     180! endif
     181!endif
     182
     183_CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_SEG_TEXT_CLASS) $(_CC_DEFAULT_LIBS) \
     184               $(_CC_PACK) $(_CC_MODEL) -d$(_CC_DEF_MODEL) $(_CC_OPT_R) $(_CC_O_CPU) $(_CC_OPTIM)
    111185
    112186
    … …  
    115189# C++ Compiler flags.
    116190#
    117 _CXX_SEG_TEXT     =
    118 _CXX_SEG_DATA     =
    119 _CXX_SEG_XCPT     =
    120 _CXX_DEFAULT_LIBS = -zl
    121 _CXX_PACK         =
    122 _CXX_XCPT         = -xd
    123 _CXX_MODEL        = -mf
     191_CXX_SEG_TEXT    =
     192_CXX_SEG_DATA    =
     193_CXX_SEG_XCPT    =
     194_CXX_SEG_TEXT_CLASS =
     195_CXX_DEFAULT_LIBS= -zl
     196_CXX_PACK        =
     197_CXX_XCPT        = -xd
     198_CXX_MODEL       = -mf
    124199!ifdef ENV_16BIT
    125 _CXX_MODEL        = -ms
    126 _OBJ_MODEL        = s
    127 _CXX_DEF_MODEL    = SMALL
    128 !else
    129 _CXX_MODEL        = -mf
    130 _CXX_DEF_MODEL    = FLAT
    131 !endif
    132 _CXX_OPT_R        =
     200_CXX_MODEL       = -ms
     201_OBJ_MODEL       = s
     202_CXX_DEF_MODEL   = SMALL
     203!else
     204_CXX_MODEL       = -mf
     205_CXX_DEF_MODEL   = FLAT
     206!endif
     207_CXX_OPT_R       =
     208_CXX_O_INLINE_USER =
     209_CXX_O_FRAMES=
     210_CXX_O_O2    =
     211_CXX_O_INLINE=
     212_CXX_O_SIZE  =
     213_CXX_O_TIME  =
     214_CXX_O_DISABLE =
     215_CXX_O_X     =
     216_CXX_O_CPU   =
     217!if "$(BUILD_MODE)" == "RELEASE"
     218! ifdef ENV_16BIT
     219_CXX_O_CPU   = -5
     220!else
     221_CXX_O_CPU   = -5r
     222!endif
     223!endif
    133224
    134225!ifdef ALL_SEG_TEXT
    … …  
    149240!ifdef CXX_SEG_XCPT
    150241_CXX_SEG_XCPT=
     242!endif
     243!ifdef ALL_SEG_TEXT_CLASS
     244_CXX_SEG_TEXT_CLASS =-nc=$(ALL_SEG_TEXT_CLASS)
     245!endif
     246!ifdef CXX_SEG_TEXT_CLASS
     247_CXX_SEG_TEXT_CLASS =-nc=$(CXX_SEG_TEXT_CLASS)
    151248!endif
    152249!if defined(CXX_DEFAULT_LIBS) || defined(ALL_DEFAULT_LIBS)
    … …  
    225322!endif
    226323
    227 _CXX_OPTIONAL = $(_CXX_SEG_TEXT) $(_CXX_SEG_DATA) $(_CXX_SEG_XCPT) $(_CXX_DEFAULT_LIBS) $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) -d$(_CXX_DEF_MODEL) \
    228                 $(_CXX_OPT_R)
    229 
     324
     325# watcom optimizations.
     326!if !defined(ALL_NO_O) && !defined(CXX_NO_O)
     327! if defined(ALL_O_INLINE_USER)
     328_CXX_O_INLINE_USER = -e=$(ALL_O_INLINE_USER)
     329! endif
     330! if defined(CXX_O_INLINE_USER)
     331_CXX_O_INLINE_USER = -e=$(CXX_O_INLINE_USER)
     332! endif
     333! if defined(CXX_O_FRAMES) || defined(ALL_O_FRAMES)
     334_CXX_O_FRAMES=f+
     335! endif
     336! if defined(CXX_O_O2)     || defined(ALL_O_O2)
     337_CXX_O_O2    =h
     338! endif
     339! if defined(CXX_O_INLINE) || defined(ALL_O_INLINE)
     340_CXX_O_INLINE=i
     341! endif
     342! if defined(CXX_O_SIZE)   || defined(ALL_O_SIZE)
     343_CXX_O_SIZE  =s
     344! endif
     345! if defined(CXX_O_TIME)   || defined(ALL_O_TIME)
     346_CXX_O_TIME  =t
     347! endif
     348! if defined(CXX_O_X)   || defined(ALL_O_X)
     349_CXX_O_X  =x
     350! endif
     351!else
     352_CXX_O_DISABLE=d
     353!endif
     354
     355_CXX_OPTIM = -o$(_CXX_O_DISABLE)$(_CXX_O_O2)$(_CXX_O_INLINE)$(_CXX_O_SIZE)$(_CXX_O_TIME)$(_CXX_O_FRAMES)$(_CXX_O_X)$(_CXX_O_INLINE_USER)
     356!if "$(_CXX_OPTIM)" == "-o"
     357_CXX_OPTIM =
     358!endif
     359
     360!if defined(ALL_O_CPU)
     361! ifdef ENV_16BIT
     362_CXX_O_CPU   = -$(ALL_O_CPU)
     363! else
     364_CXX_O_CPU   = -$(ALL_O_CPU)r
     365! endif
     366!endif
     367!if defined(CXX_O_CPU)
     368! ifdef ENV_16BIT
     369_CXX_O_CPU   = -$(CXX_O_CPU)
     370! else
     371_CXX_O_CPU   = -$(CXX_O_CPU)r
     372! endif
     373!endif
     374
     375_CXX_OPTIONAL = $(_CXX_SEG_TEXT) $(_CXX_SEG_DATA) $(_CXX_SEG_XCPT) $(_CXX_SEG_TEXT_CLASS) $(_CXX_DEFAULT_LIBS) \
     376                $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) -d$(_CXX_DEF_MODEL) $(_CXX_OPT_R) $(_CXX_O_CPU) $(_CXX_OPTIM)
     377

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

    r9153 r9165  
    1 # $Id: setup.optional.wlink.mk,v 1.1 2002-08-28 04:42:04 bird Exp $
     1# $Id: setup.optional.wlink.mk,v 1.2 2002-08-29 10:01:41 bird Exp $
    22
    33#
    … …  
    9595! error error: LD_EXTDIC/LD_NO_EXTDIC is not supported by the linker (wlink).
    9696!endif
    97 !if defined(LD_OLDCPP) || defined(LD_NO_OLDCPP)
    98 ! error error: LD_DBGPACK/LD_NO_DBGPACK is not supported by the linker (wlink).
    99 !endif
     97# don't complain!
     98#!if defined(LD_OLDCPP) || defined(LD_NO_OLDCPP)
     99#! error error: LD_OLDCPP/LD_NO_OLDCPP is not supported by the linker (wlink).
     100#!endif
    100101!if defined(LD_OPTFUNC) || defined(LD_NO_OPTFUNC)
    101102! error error: LD_DBGPACK/LD_NO_DBGPACK is not supported by the linker (wlink).

  • trunk/make/setup.os2debalp.mk

    r9136 r9165  
    1 # $Id: setup.os2debalp.mk,v 1.4 2002-08-27 03:02:52 bird Exp $
     1# $Id: setup.os2debalp.mk,v 1.5 2002-08-29 10:01:42 bird Exp $
    22
    33#
    … …  
    1010#
    1111!include $(PATH_MAKE)\setup.optional.alp.mk
    12 AS_FLAGS    = -D:OS2 -D:DEBUG $(_AS_OPTIONAL) -Mb $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
    13 AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
     12AS_FLAGS    = -D:OS2 -D:DEBUG $(_AS_OPTIONAL) -Mb $(BUILD_DEFINES:-D=-D:) $(ALL_DEFINES:-D=-D:) $(AS_DEFINES:-D=-D:) $(AS_INCLUDES:-I=-i:) $(ALL_INCLUDES:-I=-i:) -i:$(PATH_INCLUDES)
     13AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0
    1414AS_OBJ_OUT  = -Fo:
    1515

  • trunk/make/setup.os2debemx.mk

    r9154 r9165  
    1 # $Id: setup.os2debemx.mk,v 1.9 2002-08-28 05:02:20 bird Exp $
     1# $Id: setup.os2debemx.mk,v 1.10 2002-08-29 10:01:42 bird Exp $
    22
    33# ---OS2, DEBUG, EMX----------------------------
    … …  
    2323# Include some shared standard stuff: ALP, VAC optional stuff.
    2424#
    25 !include $(PATH_MAKE)\setup.os2debalp.mk
     25!include $(PATH_MAKE)\setup.os2as.mk
    2626!include $(PATH_MAKE)\setup.os2debrc.mk
    2727!include $(PATH_MAKE)\setup.os2debwrc.mk
    2828_LD_LAST_LIB = end.$(EXT_LIB)
    29 !include $(PATH_MAKE)\setup.os2debilink.mk
    30 !include $(PATH_MAKE)\setup.os2allilib.mk
     29!include $(PATH_MAKE)\setup.os2ld.mk
     30!include $(PATH_MAKE)\setup.os2ar.mk
    3131!include $(PATH_MAKE)\setup.optional.emx.mk
    3232

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

    r9154 r9165  
    1 # $Id: setup.os2debmscv6-16.mk,v 1.11 2002-08-28 05:02:20 bird Exp $
     1# $Id: setup.os2debmscv6-16.mk,v 1.12 2002-08-29 10:01:42 bird Exp $
    22
    33# ---OS2, DEBUG, MSCV6-------------------------
    … …  
    1616# Include some shared standard stuff: ALP.
    1717#
    18 !include $(PATH_MAKE)\setup.os2debalp.mk
     18!include $(PATH_MAKE)\setup.os2as.mk
    1919!include $(PATH_MAKE)\setup.os2prfrc.mk
    2020!include $(PATH_MAKE)\setup.os2prfwrc.mk
    21 !include $(PATH_MAKE)\setup.os2prfilink.mk
    22 !include $(PATH_MAKE)\setup.os2allilib.mk
     21!include $(PATH_MAKE)\setup.os2ld.mk
     22!include $(PATH_MAKE)\setup.os2ar.mk
    2323!include $(PATH_MAKE)\setup.optional.mscvx-16.mk
    2424

  • trunk/make/setup.os2debmscv6.mk

    r9154 r9165  
    1 # $Id: setup.os2debmscv6.mk,v 1.14 2002-08-28 05:02:20 bird Exp $
     1# $Id: setup.os2debmscv6.mk,v 1.15 2002-08-29 10:01:42 bird Exp $
    22
    33# ---OS2, DEBUG, MSCV6-------------------------
    … …  
    1515# Include some shared standard stuff: ALP.
    1616#
    17 !include $(PATH_MAKE)\setup.os2debalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2debrc.mk
    1919!include $(PATH_MAKE)\setup.os2debwrc.mk
    20 !include $(PATH_MAKE)\setup.os2allilib.mk
    21 !include $(PATH_MAKE)\setup.os2debilink.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
     21!include $(PATH_MAKE)\setup.os2ar.mk
    2222
    2323

  • trunk/make/setup.os2debvac308.mk

    r9154 r9165  
    1 # $Id: setup.os2debvac308.mk,v 1.18 2002-08-28 05:02:20 bird Exp $
     1# $Id: setup.os2debvac308.mk,v 1.19 2002-08-29 10:01:43 bird Exp $
    22
    33# ---OS2, DEBUG, VAC308-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, WRC, VAC optional stuff.
    1616#
    17 !include $(PATH_MAKE)\setup.os2debalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2debrc.mk
    1919!include $(PATH_MAKE)\setup.os2debwrc.mk
    20 !include $(PATH_MAKE)\setup.os2debilink.mk
    21 !include $(PATH_MAKE)\setup.os2allilib.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
     21!include $(PATH_MAKE)\setup.os2ar.mk
    2222!include $(PATH_MAKE)\setup.optional.vac3xx.mk
    2323

  • trunk/make/setup.os2debvac365.mk

    r9154 r9165  
    1 # $Id: setup.os2debvac365.mk,v 1.17 2002-08-28 05:02:20 bird Exp $
     1# $Id: setup.os2debvac365.mk,v 1.18 2002-08-29 10:01:43 bird Exp $
    22
    33# ---OS2, DEBUG, VAC365-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, VAC optional stuff.
    1616#
    17 !include $(PATH_MAKE)\setup.os2debalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2prfrc.mk
    1919!include $(PATH_MAKE)\setup.os2prfwrc.mk
    20 !include $(PATH_MAKE)\setup.os2prfilink.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
    2121_AR_NOFREE      = 1
    22 !include $(PATH_MAKE)\setup.os2allilib.mk
     22!include $(PATH_MAKE)\setup.os2ar.mk
    2323!include $(PATH_MAKE)\setup.optional.vac3xx.mk
    2424

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

    r9154 r9165  
    1 # $Id: setup.os2debwat11-16.mk,v 1.14 2002-08-28 05:02:21 bird Exp $
     1# $Id: setup.os2debwat11-16.mk,v 1.15 2002-08-29 10:01:43 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    1616#
    1717AS_DEBUG_TYPE   = Codeview
    18 !include $(PATH_MAKE)\setup.os2debalp.mk
     18!include $(PATH_MAKE)\setup.os2as.mk
    1919!include $(PATH_MAKE)\setup.os2debrc.mk
    2020!include $(PATH_MAKE)\setup.os2debwrc.mk
    21 !ifdef LD_USE_ILINK
    2221LD_OLDCPP       = 1
    23 ! include $(PATH_MAKE)\setup.os2debilink.mk
    24 !else
    2522_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
    26 ! include $(PATH_MAKE)\setup.os2debwlink.mk
    27 !endif
    28 !include $(PATH_MAKE)\setup.os2allilib.mk
     23!include $(PATH_MAKE)\setup.os2ld.mk
     24!include $(PATH_MAKE)\setup.os2ar.mk
    2925!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    3026

  • trunk/make/setup.os2debwat11.mk

    r9154 r9165  
    1 # $Id: setup.os2debwat11.mk,v 1.16 2002-08-28 05:02:21 bird Exp $
     1# $Id: setup.os2debwat11.mk,v 1.17 2002-08-29 10:01:43 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    1616#
    1717AS_DEBUG_TYPE   = Codeview
    18 !include $(PATH_MAKE)\setup.os2debalp.mk
     18!include $(PATH_MAKE)\setup.os2as.mk
    1919!include $(PATH_MAKE)\setup.os2debrc.mk
    2020!include $(PATH_MAKE)\setup.os2debwrc.mk
    21 !ifdef LD_USE_ILINK
     21_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
    2222LD_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
    28 !include $(PATH_MAKE)\setup.os2allilib.mk
     23!include $(PATH_MAKE)\setup.os2ld.mk
     24!include $(PATH_MAKE)\setup.os2ar.mk
    2925!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    3026
    … …  
    8884LIB_OS      = os2386.lib
    8985!if "$(_CXX_XCPT)" == "-xd"
    90 LIB_C_OBJ   = clib3r.lib plibmt3r.lib math387r.lib emu387.lib
    91 LIB_C_DLL   = clbrdll.lib plbrdll.lib mt7rdll.lib emu387.lib
    92 LIB_C_RTDLL = clbrdll.lib  # TODO
     86LIB_C_OBJ   = $(PATH_WATCOM)\lib386\os2\clib3r.lib $(PATH_WATCOM)\lib386\os2\plibmt3r.lib $(PATH_WATCOM)\lib386\plibmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     87LIB_C_DLL   = $(PATH_WATCOM)\lib386\os2\clbrdll.lib $(PATH_WATCOM)\lib386\os2\plbrdll.lib $(PATH_WATCOM)\lib386\plbrdll.lib $(PATH_WATCOM)\lib386\os2\mt7rdll.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     88LIB_C_RTDLL = $(PATH_WATCOM)\lib386\os2\clbrdll.lib  # TODO
    9389LIB_C_NRE   = $(LIB_C_OBJ) # TODO
    9490!else
    95 LIB_C_OBJ   = clib3r.lib plbxmt3r.lib math387r.lib emu387.lib
    96 LIB_C_DLL   = clbrdll.lib plbrdllx.lib mt7rdll.lib emu387.lib
    97 LIB_C_RTDLL = clbrdll.lib  # TODO
     91LIB_C_OBJ   = $(PATH_WATCOM)\lib386\os2\clib3r.lib $(PATH_WATCOM)\lib386\os2\plbxmt3r.lib $(PATH_WATCOM)\lib386\plbxmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     92LIB_C_DLL   = $(PATH_WATCOM)\lib386\os2\clbrdll.lib $(PATH_WATCOM)\lib386\os2\plbrdllx.lib $(PATH_WATCOM)\lib386\plbrdllx.lib $(PATH_WATCOM)\lib386\os2\mt7rdll.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     93LIB_C_RTDLL = $(PATH_WATCOM)\lib386\os2\clbrdll.lib  # TODO
    9894LIB_C_NRE   = $(LIB_C_OBJ) # TODO
    9995!endif

  • trunk/make/setup.os2debwlink.mk

    r9153 r9165  
    1 # $Id: setup.os2debwlink.mk,v 1.1 2002-08-28 04:42:05 bird Exp $
     1# $Id: setup.os2debwlink.mk,v 1.2 2002-08-29 10:01:43 bird Exp $
    22
    33#
    … …  
    1818LINK_FLAGS_EXE  = $(LINK_FLAGS)
    1919LINK_FLAGS_DLL  = $(LINK_FLAGS)
     20!if "$(LD_FORMAT)" == "NE"
     21LINK_FLAGS_SYS  = $(LINK_FLAGS) segment type code preload segment type data preload
     22!else
    2023LINK_FLAGS_SYS  = $(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
     24!endif
    2125LINK_FLAGS_VDD  = $(LINK_FLAGS_SYS)
    2226LINK_FLAGS_IFS  = $(LINK_FLAGS) segment type code preload segment type data preload

  • trunk/make/setup.os2prfalp.mk

    r9136 r9165  
    1 # $Id: setup.os2prfalp.mk,v 1.4 2002-08-27 03:02:52 bird Exp $
     1# $Id: setup.os2prfalp.mk,v 1.5 2002-08-29 10:01:44 bird Exp $
    22
    33#
    … …  
    1010#
    1111!include $(PATH_MAKE)\setup.optional.alp.mk
    12 AS_FLAGS    = -D:OS2 -D:DEBUG $(_AS_OPTIONAL) -Mb $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
    13 AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
     12AS_FLAGS    = -D:OS2 -D:DEBUG $(_AS_OPTIONAL) -Mb $(BUILD_DEFINES:-D=-D:) $(ALL_DEFINES:-D=-D:) $(AS_DEFINES:-D=-D:) $(AS_INCLUDES:-I=-i:) $(ALL_INCLUDES:-I=-i:) -i:$(PATH_INCLUDES)
     13AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0
    1414AS_OBJ_OUT  = -Fo:
    1515

  • trunk/make/setup.os2prfemx.mk

    r9154 r9165  
    1 # $Id: setup.os2prfemx.mk,v 1.9 2002-08-28 05:02:21 bird Exp $
     1# $Id: setup.os2prfemx.mk,v 1.10 2002-08-29 10:01:44 bird Exp $
    22
    33# ---OS2, PROFILE, EMX----------------------------
    … …  
    2323# Include some shared standard stuff: ALP, VAC optional stuff.
    2424#
    25 !include $(PATH_MAKE)\setup.os2prfalp.mk
     25!include $(PATH_MAKE)\setup.os2as.mk
    2626!include $(PATH_MAKE)\setup.os2prfrc.mk
    2727!include $(PATH_MAKE)\setup.os2prfwrc.mk
    2828_LD_LAST_LIB = end.$(EXT_LIB)
    29 !include $(PATH_MAKE)\setup.os2prfilink.mk
    30 !include $(PATH_MAKE)\setup.os2allilib.mk
     29!include $(PATH_MAKE)\setup.os2ld.mk
     30!include $(PATH_MAKE)\setup.os2ar.mk
    3131!include $(PATH_MAKE)\setup.optional.emx.mk
    3232

  • trunk/make/setup.os2prfvac308.mk

    r9154 r9165  
    1 # $Id: setup.os2prfvac308.mk,v 1.17 2002-08-28 05:02:21 bird Exp $
     1# $Id: setup.os2prfvac308.mk,v 1.18 2002-08-29 10:01:44 bird Exp $
    22
    33# ---OS2, PROFILE, VAC308-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, VAC optional stuff.
    1616#
    17 !include $(PATH_MAKE)\setup.os2prfalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2prfrc.mk
    1919!include $(PATH_MAKE)\setup.os2prfwrc.mk
    20 !include $(PATH_MAKE)\setup.os2prfilink.mk
    21 !include $(PATH_MAKE)\setup.os2allilib.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
     21!include $(PATH_MAKE)\setup.os2ar.mk
    2222!include $(PATH_MAKE)\setup.optional.vac3xx.mk
    2323

  • trunk/make/setup.os2prfvac365.mk

    r9154 r9165  
    1 # $Id: setup.os2prfvac365.mk,v 1.17 2002-08-28 05:02:21 bird Exp $
     1# $Id: setup.os2prfvac365.mk,v 1.18 2002-08-29 10:01:44 bird Exp $
    22
    33# ---OS2, PROFILE, VAC365-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, VAC optional stuff.
    1616#
    17 !include $(PATH_MAKE)\setup.os2prfalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2prfrc.mk
    1919!include $(PATH_MAKE)\setup.os2prfwrc.mk
    20 !include $(PATH_MAKE)\setup.os2prfilink.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
    2121_AR_NOFREE      = 1
    22 !include $(PATH_MAKE)\setup.os2allilib.mk
     22!include $(PATH_MAKE)\setup.os2ar.mk
    2323!include $(PATH_MAKE)\setup.optional.vac3xx.mk
    2424

  • trunk/make/setup.os2prfwlink.mk

    r9153 r9165  
    1 # $Id: setup.os2prfwlink.mk,v 1.1 2002-08-28 04:42:05 bird Exp $
     1# $Id: setup.os2prfwlink.mk,v 1.2 2002-08-29 10:01:45 bird Exp $
    22
    33#
    … …  
    1818LINK_FLAGS_EXE  = $(LINK_FLAGS)
    1919LINK_FLAGS_DLL  = $(LINK_FLAGS)
     20!if "$(LD_FORMAT)" == "NE"
     21LINK_FLAGS_SYS  = $(LINK_FLAGS) segment type code preload segment type data preload
     22!else
    2023LINK_FLAGS_SYS  = $(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
     24!endif
    2125LINK_FLAGS_VDD  = $(LINK_FLAGS_SYS)
    2226LINK_FLAGS_IFS  = $(LINK_FLAGS) segment type code preload segment type data preload

  • trunk/make/setup.os2relalp.mk

    r9136 r9165  
    1 # $Id: setup.os2relalp.mk,v 1.4 2002-08-27 03:02:52 bird Exp $
     1# $Id: setup.os2relalp.mk,v 1.5 2002-08-29 10:01:45 bird Exp $
    22
    33#
    … …  
    1010#
    1111!include $(PATH_MAKE)\setup.optional.alp.mk
    12 AS_FLAGS    = -D:OS2 $(_AS_OPTIONAL) -Mb $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
    13 AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
     12AS_FLAGS    = -D:OS2 $(_AS_OPTIONAL) -Mb $(BUILD_DEFINES:-D=-D:) $(ALL_DEFINES:-D=-D:) $(AS_DEFINES:-D=-D:) $(AS_INCLUDES:-I=-i:) $(ALL_INCLUDES:-I=-i:) -i:$(PATH_INCLUDES)
     13AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0
    1414AS_OBJ_OUT= -Fo:
    1515

  • trunk/make/setup.os2relemx.mk

    r9154 r9165  
    1 # $Id: setup.os2relemx.mk,v 1.9 2002-08-28 05:02:22 bird Exp $
     1# $Id: setup.os2relemx.mk,v 1.10 2002-08-29 10:01:45 bird Exp $
    22
    33# ---OS2, DEBUG, EMX----------------------------
    … …  
    2323# Include some shared standard stuff: ALP, VAC optional stuff.
    2424#
    25 !include $(PATH_MAKE)\setup.os2relalp.mk
     25!include $(PATH_MAKE)\setup.os2as.mk
    2626!include $(PATH_MAKE)\setup.os2relrc.mk
    2727!include $(PATH_MAKE)\setup.os2relwrc.mk
    2828_LD_LAST_LIB = end.$(EXT_LIB)
    29 !include $(PATH_MAKE)\setup.os2relilink.mk
    30 !include $(PATH_MAKE)\setup.os2allilib.mk
     29!include $(PATH_MAKE)\setup.os2ld.mk
     30!include $(PATH_MAKE)\setup.os2ar.mk
    3131!include $(PATH_MAKE)\setup.optional.emx.mk
    3232

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

    r9154 r9165  
    1 # $Id: setup.os2relmscv6-16.mk,v 1.11 2002-08-28 05:02:22 bird Exp $
     1# $Id: setup.os2relmscv6-16.mk,v 1.12 2002-08-29 10:01:45 bird Exp $
    22
    33# ---OS2, RELEASE, MSCV6-------------------------
    … …  
    1515# Include some shared standard stuff: ALP.
    1616#
    17 !include $(PATH_MAKE)\setup.os2relalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2relrc.mk
    1919!include $(PATH_MAKE)\setup.os2relwrc.mk
    20 !include $(PATH_MAKE)\setup.os2relilink.mk
    21 !include $(PATH_MAKE)\setup.os2allilib.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
     21!include $(PATH_MAKE)\setup.os2ar.mk
    2222!include $(PATH_MAKE)\setup.optional.mscvx-16.mk
    2323

  • trunk/make/setup.os2relmscv6.mk

    r9154 r9165  
    1 # $Id: setup.os2relmscv6.mk,v 1.14 2002-08-28 05:02:22 bird Exp $
     1# $Id: setup.os2relmscv6.mk,v 1.15 2002-08-29 10:01:45 bird Exp $
    22
    33# ---OS2, RELEASE, MSCV6-------------------------
    … …  
    1515# Include some shared standard stuff: ALP.
    1616#
    17 !include $(PATH_MAKE)\setup.os2relalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2relrc.mk
    1919!include $(PATH_MAKE)\setup.os2relwrc.mk
    20 !include $(PATH_MAKE)\setup.os2allilib.mk
    21 !include $(PATH_MAKE)\setup.os2relilink.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
     21!include $(PATH_MAKE)\setup.os2ar.mk
    2222
    2323

  • trunk/make/setup.os2relvac308.mk

    r9154 r9165  
    1 # $Id: setup.os2relvac308.mk,v 1.17 2002-08-28 05:02:22 bird Exp $
     1# $Id: setup.os2relvac308.mk,v 1.18 2002-08-29 10:01:46 bird Exp $
    22
    33# ---OS2, RELEASE, VAC308-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, VAC optional stuff.
    1616#
    17 !include $(PATH_MAKE)\setup.os2relalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2relrc.mk
    1919!include $(PATH_MAKE)\setup.os2relwrc.mk
    20 !include $(PATH_MAKE)\setup.os2relilink.mk
    21 !include $(PATH_MAKE)\setup.os2allilib.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
     21!include $(PATH_MAKE)\setup.os2ar.mk
    2222!include $(PATH_MAKE)\setup.optional.vac3xx.mk
    2323

  • trunk/make/setup.os2relvac365.mk

    r9154 r9165  
    1 # $Id: setup.os2relvac365.mk,v 1.17 2002-08-28 05:02:22 bird Exp $
     1# $Id: setup.os2relvac365.mk,v 1.18 2002-08-29 10:01:46 bird Exp $
    22
    33# ---OS2, RELEASE, VAC365-------------------------
    … …  
    1515# Include some shared standard stuff: ALP, VAC optional stuff.
    1616#
    17 !include $(PATH_MAKE)\setup.os2relalp.mk
     17!include $(PATH_MAKE)\setup.os2as.mk
    1818!include $(PATH_MAKE)\setup.os2relrc.mk
    1919!include $(PATH_MAKE)\setup.os2relwrc.mk
    20 !include $(PATH_MAKE)\setup.os2relilink.mk
     20!include $(PATH_MAKE)\setup.os2ld.mk
    2121_AR_NOFREE      = 1
    22 !include $(PATH_MAKE)\setup.os2allilib.mk
     22!include $(PATH_MAKE)\setup.os2ar.mk
    2323!include $(PATH_MAKE)\setup.optional.vac3xx.mk
    2424

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

    r9154 r9165  
    1 # $Id: setup.os2relwat11-16.mk,v 1.12 2002-08-28 05:02:22 bird Exp $
     1# $Id: setup.os2relwat11-16.mk,v 1.13 2002-08-29 10:01:46 bird Exp $
    22
    33#
    … …  
    2323#
    2424AS_DEBUG_TYPE   = Codeview
    25 !include $(PATH_MAKE)\setup.os2relalp.mk
     25!include $(PATH_MAKE)\setup.os2as.mk
    2626!include $(PATH_MAKE)\setup.os2relrc.mk
    2727!include $(PATH_MAKE)\setup.os2relwrc.mk
    28 !ifdef LD_USE_ILINK
     28_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
    2929LD_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
    35 !include $(PATH_MAKE)\setup.os2allilib.mk
     30!include $(PATH_MAKE)\setup.os2ld.mk
     31!include $(PATH_MAKE)\setup.os2ar.mk
    3632!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    3733
    … …  
    4743# The flags
    4844#
    49 _CC_FLAGS_OS =
    50 
    51 CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -5 -zq -bm -ze -w4 -zld $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    52 CC_FLAGS_EXE=$(CC_FLAGS) -omlinear -zc
    53 CC_FLAGS_DLL=$(CC_FLAGS) -omlinear -zc -bd
    54 CC_FLAGS_SYS=$(CC_FLAGS) -omlinear -s -zff -zgf -zu
     45!if "$(_CXX_OPTIM)" == ""
     46_CC_OPTIM_ = -omlinear
     47_CC_OPTIM_IFS = -out
     48!else
     49_CC_OPTIM_ =
     50_CC_OPTIM_IFS =
     51!endif
     52CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -zq -bm -ze -w4 -zld $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     53CC_FLAGS_EXE=$(CC_FLAGS) $(_CC_OPTIM_) -zc
     54CC_FLAGS_DLL=$(CC_FLAGS) $(_CC_OPTIM_) -zc -bd
     55CC_FLAGS_SYS=$(CC_FLAGS) $(_CC_OPTIM_) -s -zff -zgf -zu
    5556CC_FLAGS_VDD=$(CC_FLAGS_SYS)
    56 CC_FLAGS_IFS=$(CC_FLAGS) -out      -s -zff -zgf -zu -bd
     57CC_FLAGS_IFS=$(CC_FLAGS) $(_CC_OPTIM_IFS) -s -zff -zgf -zu -bd
    5758CC_OBJ_OUT=-fo=
    5859CC_LST_OUT=
    5960CC_PC_2_STDOUT=-pc
    6061
    61 CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -5 -zq -bm -ze -w4 -zld $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    62 CXX_FLAGS_EXE=$(CXX_FLAGS) -omlinear -zc
    63 CXX_FLAGS_DLL=$(CXX_FLAGS) -omlinear -zc -bd
    64 CXX_FLAGS_SYS=$(CXX_FLAGS) -omlinear -s -zff -zgf -zu
     62!if "$(_CXX_OPTIM)" == ""
     63_CXX_OPTIM_ = -omlinear
     64!else
     65_CXX_OPTIM_ =
     66!endif
     67CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -zq -bm -ze -w4 -zld $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     68CXX_FLAGS_EXE=$(CXX_FLAGS) $(_CXX_OPTIM_) -zc
     69CXX_FLAGS_DLL=$(CXX_FLAGS) $(_CXX_OPTIM_) -zc -bd
     70CXX_FLAGS_SYS=$(CXX_FLAGS) $(_CXX_OPTIM_) -s -zff -zgf -zu
    6571CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
    66 CXX_FLAGS_IFS=$(CXX_FLAGS) -omlnaru  -s -zff -zgf -zdp -zu -bd
     72CXX_FLAGS_IFS=$(CXX_FLAGS) $(_CXX_OPTIM_)  -s -zff -zgf -zdp -zu -bd
    6773CXX_OBJ_OUT=-fo=
    6874CXX_LST_OUT=

  • trunk/make/setup.os2relwat11.mk

    r9154 r9165  
    1 # $Id: setup.os2relwat11.mk,v 1.9 2002-08-28 05:02:23 bird Exp $
     1# $Id: setup.os2relwat11.mk,v 1.10 2002-08-29 10:01:46 bird Exp $
    22
    33#
    … …  
    2323#
    2424AS_DEBUG_TYPE   = Codeview
    25 !include $(PATH_MAKE)\setup.os2relalp.mk
     25!include $(PATH_MAKE)\setup.os2as.mk
    2626!include $(PATH_MAKE)\setup.os2relrc.mk
    2727!include $(PATH_MAKE)\setup.os2relwrc.mk
    28 !ifdef LD_USE_ILINK
    2928LD_OLDCPP       = 1
    30 ! include $(PATH_MAKE)\setup.os2relilink.mk
    31 !else
    3229_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
    33 ! include $(PATH_MAKE)\setup.os2relwlink.mk
    34 !endif
    35 !include $(PATH_MAKE)\setup.os2allilib.mk
     30!include $(PATH_MAKE)\setup.os2ld.mk
     31!include $(PATH_MAKE)\setup.os2ar.mk
    3632!include $(PATH_MAKE)\setup.optional.watcom11x.mk
    3733
    … …  
    4238CC=wcc386.exe
    4339CXX=wpp386.exe
    44 LINK=wlink.exe
    4540
    4641
    … …  
    4843# The flags
    4944#
    50 CC_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    51 CC_FLAGS_EXE=$(CC_FLAGS) -omlinear -zc
    52 CC_FLAGS_DLL=$(CC_FLAGS) -omlinear -zc -bd
    53 CC_FLAGS_SYS=$(CC_FLAGS) -omlinear -s -zdp -zff -zgf -zu
     45!if "$(_CC_OPTIM)" == ""
     46_CC_OPTIM_    = -omlinear
     47_CC_OPTIM_IFS = -omlnaru
     48!else
     49_CC_OPTIM_    =
     50_CC_OPTIM_IFS =
     51!endif
     52CC_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -zq -bm -ze -w4 -zld $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     53CC_FLAGS_EXE=$(CC_FLAGS) $(_CC_OPTIM_) -zc
     54CC_FLAGS_DLL=$(CC_FLAGS) $(_CC_OPTIM_) -zc -bd
     55CC_FLAGS_SYS=$(CC_FLAGS) $(_CC_OPTIM_) -s -zdp -zff -zgf -zu
    5456CC_FLAGS_VDD=$(CC_FLAGS_SYS)
    55 CC_FLAGS_IFS=$(CC_FLAGS_SYS) -omlnaru -bd
     57CC_FLAGS_IFS=$(CC_FLAGS_SYS) $(_CC_OPTIM_IFS) -bd
    5658CC_OBJ_OUT=-fo=
    5759CC_LST_OUT=
    5860CC_PC_2_STDOUT=-pc
    5961
    60 CXX_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    61 CXX_FLAGS_EXE=$(CXX_FLAGS) -omlinear -zc
    62 CXX_FLAGS_DLL=$(CXX_FLAGS) -omlinear -zc -bd
    63 CXX_FLAGS_SYS=$(CXX_FLAGS) -omlinear -omlinear -s -zdp -zff -zgf -zu
     62!if "$(_CXX_OPTIM)" == ""
     63_CXX_OPTIM_    = -omlinear
     64_CXX_OPTIM_IFS = -omlnaru
     65!else
     66_CXX_OPTIM_    =
     67_CXX_OPTIM_IFS =
     68!endif
     69CXX_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -zq -bm -ze -w4 -zld $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     70CXX_FLAGS_EXE=$(CXX_FLAGS) $(_CXX_OPTIM_) -zc
     71CXX_FLAGS_DLL=$(CXX_FLAGS) $(_CXX_OPTIM_) -zc -bd
     72CXX_FLAGS_SYS=$(CXX_FLAGS) $(_CXX_OPTIM_) -omlinear -s -zdp -zff -zgf -zu
    6473CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
    65 CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) -omlnaru -bd
     74CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) $(_CXX_OPTIM_IFS) -bd
    6675CXX_OBJ_OUT=-fo=
    6776CXX_LST_OUT=
    … …  
    96105LIB_OS      = os2386.lib
    97106!if "$(_CXX_XCPT)" == "-xd"
    98 LIB_C_OBJ   = clib3r.lib plibmt3r.lib math387r.lib emu387.lib
    99 LIB_C_DLL   = clbrdll.lib plbrdll.lib mt7rdll.lib emu387.lib
    100 LIB_C_RTDLL = clbrdll.lib  # TODO
     107LIB_C_OBJ   = $(PATH_WATCOM)\lib386\os2\clib3r.lib $(PATH_WATCOM)\lib386\os2\plibmt3r.lib $(PATH_WATCOM)\lib386\plibmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     108LIB_C_DLL   = $(PATH_WATCOM)\lib386\os2\clbrdll.lib $(PATH_WATCOM)\lib386\os2\plbrdll.lib $(PATH_WATCOM)\lib386\plbrdll.lib $(PATH_WATCOM)\lib386\os2\mt7rdll.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     109LIB_C_RTDLL = $(PATH_WATCOM)\lib386\os2\clbrdll.lib  # TODO
    101110LIB_C_NRE   = $(LIB_C_OBJ) # TODO
    102111!else
    103 LIB_C_OBJ   = clib3r.lib plbxmt3r.lib math387r.lib emu387.lib
    104 LIB_C_DLL   = clbrdll.lib plbrdllx.lib mt7rdll.lib emu387.lib
    105 LIB_C_RTDLL = clbrdll.lib  # TODO
     112LIB_C_OBJ   = $(PATH_WATCOM)\lib386\os2\clib3r.lib $(PATH_WATCOM)\lib386\os2\plbxmt3r.lib $(PATH_WATCOM)\lib386\plbxmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     113LIB_C_DLL   = $(PATH_WATCOM)\lib386\os2\clbrdll.lib $(PATH_WATCOM)\lib386\os2\plbrdllx.lib $(PATH_WATCOM)\lib386\plbrdllx.lib $(PATH_WATCOM)\lib386\os2\mt7rdll.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
     114LIB_C_RTDLL = $(PATH_WATCOM)\lib386\os2\clbrdll.lib  # TODO
    106115LIB_C_NRE   = $(LIB_C_OBJ) # TODO
    107116!endif

  • trunk/make/setup.tools.mk

    r9152 r9165  
    1 # $Id: setup.tools.mk,v 1.14 2002-08-28 04:41:24 bird Exp $
     1# $Id: setup.tools.mk,v 1.15 2002-08-29 10:01:46 bird Exp $
    22
    33
    … …  
    6262!endif
    6363TOOL_MAKE       = $(MAKE:.exe=).exe -nologo
    64 !ifndef LD_USE_ILINK
    65 TOOL_MAPSYM     = $(PATH_TOOLS)\MapSym.cmd $(BUILD_ENV)
    66 !else
    67 TOOL_MAPSYM     = $(PATH_TOOLS)\MapSym.cmd VAC308
    68 !endif
     64TOOL_MAPSYM     = $(PATH_TOOLS)\MapSym.cmd $(TOOL_MAPSYM_TYPE)
    6965TOOL_RM         = $(PATH_TOOLS)\rm.exe -fF
    7066TOOL_RMDIR      = rmdir
Note: See TracChangeset for help on using the changeset viewer.