Changeset 9169 for trunk/make


Ignore:
Timestamp:
Aug 29, 2002, 2:06:19 PM (23 years ago)
Author:
bird
Message:

Bugfixing.

Location:
trunk/make
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/make/setup.optional.watcom11x.mk

    r9165 r9169  
    1 # $Id: setup.optional.watcom11x.mk,v 1.6 2002-08-29 10:01:41 bird Exp $
     1# $Id: setup.optional.watcom11x.mk,v 1.7 2002-08-29 12:06:17 bird Exp $
    22
    33#
     
    3434_CC_O_DISABLE =
    3535_CC_O_X     =
    36 !if "$(BUILD_MODE)" == "RELEASE"
    37 ! ifdef ENV_16BIT
     36!ifdef ENV_16BIT
    3837_CC_O_CPU   = -5
    3938!else
    4039_CC_O_CPU   = -5r
    41 !endif
    4240!endif
    4341
     
    215213_CXX_O_X     =
    216214_CXX_O_CPU   =
    217 !if "$(BUILD_MODE)" == "RELEASE"
    218 ! ifdef ENV_16BIT
     215!ifdef ENV_16BIT
    219216_CXX_O_CPU   = -5
    220217!else
    221218_CXX_O_CPU   = -5r
    222 !endif
    223219!endif
    224220
  • trunk/make/setup.optional.wlink.mk

    r9165 r9169  
    1 # $Id: setup.optional.wlink.mk,v 1.2 2002-08-29 10:01:41 bird Exp $
     1# $Id: setup.optional.wlink.mk,v 1.3 2002-08-29 12:06:17 bird Exp $
    22
    33#
     
    2222_LD_PACKDATA    =
    2323_LD_IGNORECASE  = ,caseexact
     24_LD_CACHE       = ,cache
    2425
    2526
     
    8788_LD_IGNORECASE  = ,caseexact
    8889!endif
     90!if defined(LD_CACHE)
     91_LD_CACHE   = ,cache
     92!endif
     93!if defined(LD_NO_CACHE)
     94_LD_CACHE   = ,nocache
     95!endif
     96!if defined(LD_DEF_CACHE)
     97_LD_CACHE   =
     98!endif
    8999
    90 _LD_OPTIONAL = $(_LD_SORT) Option verbose $(_LD_QUIET) $(_LD_ALIGN) $(_LD_DOSSEG) $(_LD_BASE) $(_LD_PACKCODE) $(_LD_PACKDATA)
     100
     101_LD_OPTIONAL = $(_LD_SORT) Option verbose $(_LD_QUIET) $(_LD_ALIGN) $(_LD_DOSSEG) $(_LD_BASE) $(_LD_PACKCODE) $(_LD_PACKDATA) $(_LD_CACHE) $(_LD_DEFAULT_LIBS)
    91102
    92103
  • trunk/make/setup.os2debwat11-16.mk

    r9165 r9169  
    1 # $Id: setup.os2debwat11-16.mk,v 1.15 2002-08-29 10:01:43 bird Exp $
     1# $Id: setup.os2debwat11-16.mk,v 1.16 2002-08-29 12:06:17 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
     
    3636# The flags
    3737#
    38 CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -dDEBUG -5 -zq -bm -ze -w4 -zld -d2 -hc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     38CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -dDEBUG -zq -bm -ze -w4 -zld -d2 -hc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    3939CC_FLAGS_EXE=$(CC_FLAGS) -zc
    4040CC_FLAGS_DLL=$(CC_FLAGS) -zc -bd
     
    4646CC_PC_2_STDOUT=-pc
    4747
    48 CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -dDEBUG -5 -zq -bm -ze -w4 -zld -d2 -hc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     48CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -dDEBUG -zq -bm -ze -w4 -zld -d2 -hc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    4949CXX_FLAGS_EXE=$(CXX_FLAGS) -zc
    5050CXX_FLAGS_DLL=$(CXX_FLAGS) -zc -bd
  • trunk/make/setup.os2debwat11.mk

    r9165 r9169  
    1 # $Id: setup.os2debwat11.mk,v 1.17 2002-08-29 10:01:43 bird Exp $
     1# $Id: setup.os2debwat11.mk,v 1.18 2002-08-29 12:06:18 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
     
    3636# The flags
    3737#
    38 CC_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld -d2 -hc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     38CC_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -zq -bm -ze -w4 -zld -d2 -hc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    3939CC_FLAGS_EXE=$(CC_FLAGS) -zc
    4040CC_FLAGS_DLL=$(CC_FLAGS) -zc -bd
     
    4646CC_PC_2_STDOUT=-pc
    4747
    48 CXX_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld -d2 -hc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
     48CXX_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -zq -bm -ze -w4 -zld -d2 -hc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
    4949CXX_FLAGS_EXE=$(CXX_FLAGS) -zc
    5050CXX_FLAGS_DLL=$(CXX_FLAGS) -zc -bd
  • trunk/make/setup.os2debwlink.mk

    r9165 r9169  
    1 # $Id: setup.os2debwlink.mk,v 1.2 2002-08-29 10:01:43 bird Exp $
     1# $Id: setup.os2debwlink.mk,v 1.3 2002-08-29 12:06:18 bird Exp $
    22
    33#
     
    1515# The flags
    1616#
    17 LINK_FLAGS      = Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) Debug codeview all
     17LINK_FLAGS      = Option eliminate, manglednames, caseexact, verbose $(_LD_OPTIONAL) Debug codeview all
    1818LINK_FLAGS_EXE  = $(LINK_FLAGS)
    1919LINK_FLAGS_DLL  = $(LINK_FLAGS)
  • trunk/make/setup.os2prfwlink.mk

    r9165 r9169  
    1 # $Id: setup.os2prfwlink.mk,v 1.2 2002-08-29 10:01:45 bird Exp $
     1# $Id: setup.os2prfwlink.mk,v 1.3 2002-08-29 12:06:18 bird Exp $
    22
    33#
     
    1515# The flags
    1616#
    17 LINK_FLAGS      = Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) Debug codeview all
     17LINK_FLAGS      = Option eliminate, manglednames, caseexact, verbose $(_LD_OPTIONAL) Debug codeview all
    1818LINK_FLAGS_EXE  = $(LINK_FLAGS)
    1919LINK_FLAGS_DLL  = $(LINK_FLAGS)
  • trunk/make/setup.os2relwat11.mk

    r9165 r9169  
    1 # $Id: setup.os2relwat11.mk,v 1.10 2002-08-29 10:01:46 bird Exp $
     1# $Id: setup.os2relwat11.mk,v 1.11 2002-08-29 12:06:18 bird Exp $
    22
    33#
     
    5555CC_FLAGS_SYS=$(CC_FLAGS) $(_CC_OPTIM_) -s -zdp -zff -zgf -zu
    5656CC_FLAGS_VDD=$(CC_FLAGS_SYS)
    57 CC_FLAGS_IFS=$(CC_FLAGS_SYS) $(_CC_OPTIM_IFS) -bd
     57CC_FLAGS_IFS=$(CC_FLAGS) $(_CC_OPTIM_IFS) -s -zdp -zff -zgf -zu -bd
    5858CC_OBJ_OUT=-fo=
    5959CC_LST_OUT=
     
    7070CXX_FLAGS_EXE=$(CXX_FLAGS) $(_CXX_OPTIM_) -zc
    7171CXX_FLAGS_DLL=$(CXX_FLAGS) $(_CXX_OPTIM_) -zc -bd
    72 CXX_FLAGS_SYS=$(CXX_FLAGS) $(_CXX_OPTIM_) -omlinear -s -zdp -zff -zgf -zu
     72CXX_FLAGS_SYS=$(CXX_FLAGS) $(_CXX_OPTIM_) -s -zdp -zff -zgf -zu
    7373CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
    74 CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) $(_CXX_OPTIM_IFS) -bd
     74CXX_FLAGS_IFS=$(CXX_FLAGS) $(_CXX_OPTIM_IFS) -s -zdp -zff -zgf -zu -bd
    7575CXX_OBJ_OUT=-fo=
    7676CXX_LST_OUT=
  • trunk/make/setup.os2relwlink.mk

    r9153 r9169  
    1 # $Id: setup.os2relwlink.mk,v 1.1 2002-08-28 04:42:06 bird Exp $
     1# $Id: setup.os2relwlink.mk,v 1.2 2002-08-29 12:06:18 bird Exp $
    22
    33#
     
    1515# The flags
    1616#
    17 LINK_FLAGS      = Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) #Debug codeview all
     17LINK_FLAGS      = Option eliminate, manglednames, caseexact, verbose $(_LD_OPTIONAL) #Debug codeview all
    1818LINK_FLAGS_EXE  = $(LINK_FLAGS)
    1919LINK_FLAGS_DLL  = $(LINK_FLAGS)
  • trunk/make/setup.tools.mk

    r9165 r9169  
    1 # $Id: setup.tools.mk,v 1.15 2002-08-29 10:01:46 bird Exp $
     1# $Id: setup.tools.mk,v 1.16 2002-08-29 12:06:19 bird Exp $
    22
    33
     
    3838TOOL_CMP        = $(PATH_TOOLS)\cmp.exe
    3939TOOL_CMDQD      = $(PATH_TOOLS)\cmdqd.exe
    40 !if "$(BUILD_SHELL)" != "4OS2"
     40!if "$(COMSPEC:4OS2.EXE=x)" == "$(COMSPEC)"
    4141TOOL_COPY       = copy
    4242!else
  • trunk/make/setup.win32debwat11.mk

    r9153 r9169  
    1 # $Id: setup.win32debwat11.mk,v 1.10 2002-08-28 04:42:06 bird Exp $
     1# $Id: setup.win32debwat11.mk,v 1.11 2002-08-29 12:06:19 bird Exp $
    22
    33# ---WIN32, DEBUG, WAT11-------------------------
     
    4848AR_LNK2= $(@R).lst
    4949
    50 CC_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
     50CC_FLAGS=-bt=os2v2 -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -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
    5151CC_FLAGS_EXE=$(CC_FLAGS)
    5252CC_FLAGS_DLL=$(CC_FLAGS) -bd
     
    5858CC_PC_2_STDOUT=-pc
    5959
    60 CXX_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
     60CXX_FLAGS=-bt=os2v2 -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -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
    6161CXX_FLAGS_EXE=$(CXX_FLAGS)
    6262CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
Note: See TracChangeset for help on using the changeset viewer.