Changeset 8423 for trunk/make


Ignore:
Timestamp:
May 16, 2002, 1:37:08 PM (23 years ago)
Author:
bird
Message:

Merged in latest changes.

Location:
trunk/make
Files:
25 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/make/process.forwarder.mak

    r8297 r8423  
    1 # $Id: process.forwarder.mak,v 1.2 2002-04-22 02:21:51 bird Exp $
     1# $Id: process.forwarder.mak,v 1.3 2002-05-16 11:36:59 bird Exp $
    22
    33#
    … …  
    2525!endif
    2626
    27 !if "$(TARGET_NAME)" == ""
     27!if "$(TARGET_NAME)" == "" && "$(TARGET_MODE)" != "EMPTY"
    2828!error Fatal error: TARGET_NAME is not defined! Should be set in the makefile.
     29!endif
     30
     31# -----------------------------------------------------------------------------
     32# Set necessary defaults.
     33# -----------------------------------------------------------------------------
     34
     35# just make it shut up for now.
     36TARGET = process.forwarder.mak
     37
     38# Default makefile names.
     39!ifndef BUILD_MAKEFILE
     40BUILD_MAKEFILE = Makefile
     41!endif
     42
     43# Default makefile name.
     44!ifndef MAKEFILE
     45MAKEFILE = $(BUILD_MAKEFILE)
    2946!endif
    3047
    … …  
    5269    @ \
    5370!endif
    54     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     71    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    5572
    5673.asm.$(EXT_OBJ):
    … …  
    5875    @ \
    5976!endif
    60     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     77    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    6178
    6279
    … …  
    6683    @ \
    6784!endif
    68     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     85    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    6986
    7087.cpp.$(EXT_OBJ):
    … …  
    7289    @ \
    7390!endif
    74     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     91    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    7592
    7693
    … …  
    8097    @ \
    8198!endif
    82     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     99    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    83100
    84101
    … …  
    88105    @ \
    89106!endif
    90     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     107    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    91108
    92109.c.$(EXT_OBJ):
    … …  
    94111    @ \
    95112!endif
    96     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     113    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    97114
    98115
    … …  
    102119    @ \
    103120!endif
    104     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     121    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    105122
    106123
    … …  
    110127    @ \
    111128!endif
    112     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     129    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    113130
    114131.rc.res:
    … …  
    116133    @ \
    117134!endif
    118     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     135    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    119136
    120137
    … …  
    136153    @ \
    137154!endif
    138     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     155    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    139156
    140157
    … …  
    147164    @ \
    148165!endif
    149     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     166    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    150167
    151168
    … …  
    158175    @ \
    159176!endif
    160     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     177    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    161178
    162179
    … …  
    169186    @ \
    170187!endif
    171     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     188    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    172189
    173190
    … …  
    191208    @ \
    192209!endif
    193     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     210    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    194211
    195212
    … …  
    203220    @ \
    204221!endif
    205     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     222    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    206223
    207224
    … …  
    210227# The $(TARGET) rule - For EXE, DLL, SYS and IFS targets
    211228# -----------------------------------------------------------------------------
    212 !if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
     229!if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
    213230$(TARGET):
    214231!ifndef BUILD_VERBOSE
    215232    @ \
    216233!endif
    217     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     234    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    218235!endif
    219236
    … …  
    228245    @ \
    229246!endif
    230     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     247    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    231248!endif
    232249
    … …  
    251268    @ \
    252269!endif
    253     $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) $@
     270    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
    254271
    255272!endif

  • trunk/make/process.mak

    r8362 r8423  
    1 # $Id: process.mak,v 1.12 2002-05-01 04:00:17 bird Exp $
     1# $Id: process.mak,v 1.13 2002-05-16 11:37:00 bird Exp $
    22
    33#
    … …  
    1818# -----------------------------------------------------------------------------
    1919!if "$(MAKE_SETUP_INCLUDED)" != "YES"
    20 !error Fatal error: You must include setup.mak before process.mak in the makefile.
     20! if [$(ECHO) $(CLRERR)Fatal error: You must include setup.mak before process.mak in the makefile.$(CLRRST)]
     21! endif
     22! error
    2123!endif
    2224!if "$(ENV_STATUS)" != "OK"
    23 !error Fatal error: The environment is not valid. Bad setup.mak?
    24 !endif
    25 
    26 !if "$(TARGET_NAME)" == ""
    27 !error Fatal error: TARGET_NAME is not defined! Should be set in the makefile.
     25! if [$(ECHO) $(CLRERR)Fatal error: The environment is not valid. Bad setup.mak?$(CLRRST)]
     26! endif
     27! error
     28!endif
     29
     30!if "$(TARGET_NAME)" == "" && "$(TARGET_MODE)" != "EMPTY"
     31! if [$(ECHO) $(CLRERR)Fatal error: TARGET_NAME is not defined! Should be set in the makefile.$(CLRRST)]
     32! endif
     33! error
    2834!endif
    2935
    … …  
    3339# Dynamic Load Library target mode.
    3440!  if "$(TARGET_MODE)" != "DLL"
    35 # Dynamic Load Library target mode - Special variant for making custom C/C++ runtime DLL.
    36 !   if "$(TARGET_MODE)" != "CRT"
    3741# Drive (/ system software) target mode.
    38 !    if "$(TARGET_MODE)" != "SYS"
     42!   if "$(TARGET_MODE)" != "SYS"
    3943# Installable File System Drive target mode. (Also called FSD, File System Driver.)
    40 !     if "$(TARGET_MODE)" != "IFS"
     44!    if "$(TARGET_MODE)" != "IFS"
    4145# Virtual Device Driver target mode.
    42 !      if "$(TARGET_MODE)" != "VDD"
     46!     if "$(TARGET_MODE)" != "VDD"
    4347# Object Library target mode.
    44 !       if "$(TARGET_MODE)" != "LIB"
     48!      if "$(TARGET_MODE)" != "LIB"
    4549# Object Library target mode - Special variant which is to be linked with a SYS target.
    46 !        if "$(TARGET_MODE)" != "SYSLIB"
     50!       if "$(TARGET_MODE)" != "SYSLIB"
    4751# Object Library target mode - Special variant which is to be linked with an IFS target.
    48 !         if "$(TARGET_MODE)" != "IFSLIB"
     52!        if "$(TARGET_MODE)" != "IFSLIB"
    4953# Dummy/Hub/TopLevel empty makefile. This has no target.
    50 !          if "$(TARGET_MODE)" != "EMPTY"
    51 !           error Error: Bad TARGET_MODE="$(TARGET_MODE)". Valid ones are: EXE, DLL, CRT, EXE, SYS, IFS, VDD, LIB, SYSLIB, IFSLIB and EMPTY.
     54!         if "$(TARGET_MODE)" != "EMPTY"
     55!          if [$(ECHO) $(CLRERR)Fatal Error: Bad TARGET_MODE="$(TARGET_MODE)". Valid ones are: EXE, DLL, SYS, IFS, VDD, LIB, SYSLIB, IFSLIB and EMPTY.$(CLRRST)]
    5256!          endif
     57!          error
    5358!         endif
    5459!        endif
    … …  
    7479# Default extension corresponds to the target mode.
    7580!ifndef TARGET_EXT
    76 ! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     81! if "$(TARGET_MODE)" == "DLL"
    7782TARGET_EXT  = $(EXT_DLL)
    7883! endif
    … …  
    96101! endif
    97102! ifndef TARGET_EXT
    98 !error Internal Error: TARGET_EXT not set. Probably invalid TARGET_MODE. (TARGET_MODE="$(TARGET_MODE)")
     103!  if [$(ECHO) $(CLRERR)Internal Error: TARGET_EXT not set. Probably invalid TARGET_MODE. (TARGET_MODE="$(TARGET_MODE)")$(CLRRST)]
     104!  endif
     105!  error
    99106! endif
    100107!endif
    … …  
    154161# Default import library file. (output)
    155162!ifndef TARGET_ILIB
    156 ! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     163! if "$(TARGET_MODE)" == "DLL"
    157164TARGET_ILIB =$(PATH_LIB)\$(TARGET_NAME).$(EXT_ILIB)
    158165! endif
    … …  
    169176TARGET_PUBNAME=$(PATH_EXE)\$(TARGET_NAME).$(TARGET_EXT)
    170177!  endif
    171 !  if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     178!  if "$(TARGET_MODE)" == "DLL"
    172179TARGET_PUBNAME=$(PATH_DLL)\$(TARGET_NAME).$(TARGET_EXT)
    173180!  endif
    … …  
    186193!endif
    187194
     195# Default makefile names.
     196!ifndef BUILD_MAKEFILE
     197BUILD_MAKEFILE = Makefile
     198!endif
     199
    188200# Default makefile name.
    189201!ifndef MAKEFILE
    190 MAKEFILE = makefile
     202MAKEFILE = $(BUILD_MAKEFILE)
    191203!endif
    192204
    193205# Ignore linker warnings for some target modes.
    194206!ifndef TARGET_IGNORE_LINKER_WARNINGS
    195 ! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     207! if "$(TARGET_MODE)" == "DLL"
    196208TARGET_IGNORE_LINKER_WARNINGS = 1
    197209! endif
    … …  
    233245!   endif
    234246!   if [$(TOOL_CREATEPATH) $(PATH_TARGET)]
    235 !    error Could not create $(PATH_TARGET)
     247!    if [$(ECHO) $(CLRERR)Error: Could not create $(CLRFIL)$(PATH_TARGET)$(CLRRST)]
     248!    endif
     249!    error
    236250!   endif
    237251!  endif
    … …  
    252266# Assembling assembly source.
    253267.asm{$(PATH_TARGET)}.$(EXT_OBJ):
    254     @$(ECHO) Assembling $(CLRFIL)$< $(CLRRST)
    255 !ifndef BUILD_VERBOSE
    256     @ \
    257 !endif
     268    @$(ECHO) Assembling $(CLRFIL)$< $(CLRTXT)$(TOOL_JOB_SUB_MSG) $(CLRRST)
     269! ifndef BUILD_VERBOSE
     270    @ \
     271! endif
    258272!if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
    259     $(AS) $(AS_FLAGS_SYS) $< $(AS_OBJ_OUT)$@
     273    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS_SYS) $< $(AS_OBJ_OUT)$@
    260274!else
    261     $(AS) $(AS_FLAGS) $< $(AS_OBJ_OUT)$@
     275    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS) $< $(AS_OBJ_OUT)$@
    262276!endif
    263277
    … …  
    276290# Compiling C++ source.
    277291.cpp{$(PATH_TARGET)}.$(EXT_OBJ):
     292    @$(ECHO) C++ Compiler $(CLRFIL)$< $(CLRTXT)$(TOOL_JOB_SUB_MSG) $(CLRRST)
     293!ifndef BUILD_VERBOSE
     294    @ \
     295!endif
     296    $(TOOL_JOB_SUB) $(CXX) \
     297!if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "LIB"
     298        $(CXX_FLAGS_EXE) \
     299!endif
     300!if "$(TARGET_MODE)" == "DLL"
     301        $(CXX_FLAGS_DLL) \
     302!endif
     303!if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB"
     304        $(CXX_FLAGS_SYS) \
     305!endif
     306!if "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
     307        $(CXX_FLAGS_IFS) \
     308!endif
     309!if "$(CXX_LST_OUT)" != ""
     310        $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
     311!endif
     312        $(CXX_OBJ_OUT)$@ $<
     313
     314.cpp.$(EXT_OBJ):
    278315    @$(ECHO) C++ Compiler $(CLRFIL)$< $(CLRRST)
    279316!ifndef BUILD_VERBOSE
    … …  
    284321        $(CXX_FLAGS_EXE) \
    285322!endif
    286 !if "$(TARGET_MODE)" == "CRT"
    287         $(CXX_FLAGS_CRT) \
    288 !endif
    289323!if "$(TARGET_MODE)" == "DLL"
    290324        $(CXX_FLAGS_DLL) \
    … …  
    299333        $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
    300334!endif
    301         $(CXX_OBJ_OUT)$@ $<
    302 
    303 .cpp.$(EXT_OBJ):
     335        $(CXX_OBJ_OUT)$(PATH_TARGET)\$(@F) $<
     336
     337
     338# Pre-Compiling C++ source.
     339.cpp.pre-cpp:
    304340    @$(ECHO) C++ Compiler $(CLRFIL)$< $(CLRRST)
    305341!ifndef BUILD_VERBOSE
    … …  
    310346        $(CXX_FLAGS_EXE) \
    311347!endif
    312 !if "$(TARGET_MODE)" == "CRT"
    313         $(CXX_FLAGS_CRT) \
    314 !endif
    315348!if "$(TARGET_MODE)" == "DLL"
    316349        $(CXX_FLAGS_DLL) \
    … …  
    322355        $(CXX_FLAGS_IFS) \
    323356!endif
    324 !if "$(CXX_LST_OUT)" != ""
    325         $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
    326 !endif
    327         $(CXX_OBJ_OUT)$(PATH_TARGET)\$(@F) $<
    328 
    329 
    330 # Pre-Compiling C++ source.
    331 .cpp.pre-cpp:
    332     @$(ECHO) C++ Compiler $(CLRFIL)$< $(CLRRST)
    333 !ifndef BUILD_VERBOSE
    334     @ \
    335 !endif
    336     $(CXX) \
    337 !if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "LIB"
    338         $(CXX_FLAGS_EXE) \
    339 !endif
    340 !if "$(TARGET_MODE)" == "CRT"
    341         $(CXX_FLAGS_CRT) \
    342 !endif
    343 !if "$(TARGET_MODE)" == "DLL"
    344         $(CXX_FLAGS_DLL) \
    345 !endif
    346 !if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB"
    347         $(CXX_FLAGS_SYS) \
    348 !endif
    349 !if "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
    350         $(CXX_FLAGS_IFS) \
    351 !endif
    352357        $(CXX_PC_2_STDOUT) $< > $@
    353358
    … …  
    355360# Compiling C source.
    356361.c{$(PATH_TARGET)}.$(EXT_OBJ):
     362    @$(ECHO) C Compiler $(CLRFIL)$< $(CLRTXT)$(TOOL_JOB_SUB_MSG) $(CLRRST)
     363!ifndef BUILD_VERBOSE
     364    @ \
     365!endif
     366    $(TOOL_JOB_SUB) $(CC) \
     367!if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "LIB"
     368        $(CC_FLAGS_EXE) \
     369!endif
     370!if "$(TARGET_MODE)" == "DLL"
     371        $(CC_FLAGS_DLL) \
     372!endif
     373!if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB"
     374        $(CC_FLAGS_SYS) \
     375!endif
     376!if "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
     377        $(CC_FLAGS_IFS) \
     378!endif
     379!if "$(CC_LST_OUT)" != ""
     380        $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
     381!endif
     382        $(CC_OBJ_OUT)$@ $<
     383
     384.c.$(EXT_OBJ):
    357385    @$(ECHO) C Compiler $(CLRFIL)$< $(CLRRST)
    358386!ifndef BUILD_VERBOSE
    … …  
    363391        $(CC_FLAGS_EXE) \
    364392!endif
    365 !if "$(TARGET_MODE)" == "CRT"
    366         $(CC_FLAGS_CRT) \
    367 !endif
    368393!if "$(TARGET_MODE)" == "DLL"
    369394        $(CC_FLAGS_DLL) \
    … …  
    378403        $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
    379404!endif
    380         $(CC_OBJ_OUT)$@ $<
    381 
    382 .c.$(EXT_OBJ):
    383     @$(ECHO) C Compiler $(CLRFIL)$< $(CLRRST)
     405        $(CC_OBJ_OUT)$(PATH_TARGET)\$(@F) $<
     406
     407
     408# Pre-Compiling C source.
     409.c.pre-c:
     410    @$(ECHO) C PreCompiler $(CLRFIL)$< $(CLRRST)
    384411!ifndef BUILD_VERBOSE
    385412    @ \
    … …  
    389416        $(CC_FLAGS_EXE) \
    390417!endif
    391 !if "$(TARGET_MODE)" == "CRT"
    392         $(CC_FLAGS_CRT) \
    393 !endif
    394418!if "$(TARGET_MODE)" == "DLL"
    395419        $(CC_FLAGS_DLL) \
    … …  
    401425        $(CC_FLAGS_IFS) \
    402426!endif
    403 !if "$(CC_LST_OUT)" != ""
    404         $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
    405 !endif
    406         $(CC_OBJ_OUT)$(PATH_TARGET)\$(@F) $<
    407 
    408 
    409 # Pre-Compiling C source.
    410 .c.pre-c:
    411     @$(ECHO) C PreCompiler $(CLRFIL)$< $(CLRRST)
    412 !ifndef BUILD_VERBOSE
    413     @ \
    414 !endif
    415     $(CC) \
    416 !if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "LIB"
    417         $(CC_FLAGS_EXE) \
    418 !endif
    419 !if "$(TARGET_MODE)" == "CRT"
    420         $(CC_FLAGS_CRT) \
    421 !endif
    422 !if "$(TARGET_MODE)" == "DLL"
    423         $(CC_FLAGS_DLL) \
    424 !endif
    425 !if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB"
    426         $(CC_FLAGS_SYS) \
    427 !endif
    428 !if "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
    429         $(CC_FLAGS_IFS) \
    430 !endif
    431427        $(CC_PC_2_STDOUT) $< > $@
    432428
    … …  
    434430# Compiling resources.
    435431.rc{$(PATH_TARGET)}.res:
    436     @$(ECHO) RC Compiler $(CLRFIL)$< $(CLRRST)
    437 !ifndef BUILD_VERBOSE
    438     @ \
    439 !endif
    440     $(RC) $(RC_FLAGS) $< $@
     432    @$(ECHO) RC Compiler $(CLRFIL)$< $(CLRTXT)$(TOOL_JOB_SUB_MSG)$(CLRRST)
     433!ifndef BUILD_VERBOSE
     434    @ \
     435!endif
     436    $(TOOL_JOB_SUB) $(RC) $(RC_FLAGS) $< $@
    441437
    442438.rc.res:
    … …  
    466462SUBDIRS_BUILD = subbuild
    467463$(SUBDIRS_BUILD):
    468     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) build
     464    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) build
    469465!endif
    470466
    … …  
    491487SUBDIRS_LIB = subdir_lib
    492488$(SUBDIRS_LIB):
    493     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) lib
     489    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) lib
    494490!endif
    495491
    … …  
    500496!endif
    501497
    502 !if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFSLIB"
     498!if "$(TARGET_PUBLIC_PART)" != "" && ("$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFSLIB")
    503499lib: $(SUBDIRS_LIB) $(TARGET_ILIB) $(TARGET) $(TARGET_PUBNAME)
    504500!else
    … …  
    521517    @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_BIN)$(CLRRST)
    522518    @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
     519    @if not exist $(PATH_BIN) $(TOOL_CREATEPATH)       $(PATH_BIN)
    523520    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_BIN)
    524521    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_BIN)
    525522! endif
    526 ! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     523! if "$(TARGET_MODE)" == "DLL"
    527524    @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_DLL)$(CLRRST)
    528525    @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
     526    @if not exist $(PATH_DLL) $(TOOL_CREATEPATH)       $(PATH_DLL)
    529527    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_DLL)
    530528    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_DLL)
    … …  
    533531    @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_SYS)$(CLRRST)
    534532    @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
     533    @if not exist $(PATH_SYS) $(TOOL_CREATEPATH)       $(PATH_SYS)
    535534    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_SYS)
    536535    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_SYS)
    537536! endif
    538 !if 1 # these targets are either TARGET_PUBLIC or all private.
     537!if 0 # these targets are either TARGET_PUBLIC or all private.
    539538!  if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFSLIB"
    540539    @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_LIB)$(CLRRST)
    541540    @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
     541    @if not exist $(PATH_LIB) $(TOOL_CREATEPATH)       $(PATH_LIB)
    542542    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_LIB)
    543543    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_LIB)
    … …  
    549549!endif
    550550!ifdef SUBDIRS
    551     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) $@
     551    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
    552552!endif
    553553!ifdef PREMAKEFILES
    … …  
    567567testcase:
    568568!if [$(TOOL_EXISTS) testcase] == 0
    569     @$(TOOL_DODIRS) "testcase" $(TOOL_MAKE) $@
     569    @$(TOOL_DODIRS) "testcase" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
    570570!endif
    571571!if [$(TOOL_EXISTS) testcase.mak] == 0
    … …  
    573573!endif
    574574!ifdef SUBDIRS
    575     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) $@
     575    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
    576576!endif
    577577!ifdef PREMAKEFILES
    … …  
    611611        $(TOOL_DEP_FILES)
    612612!ifdef SUBDIRS
    613     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) NODEP=1 $@
     613    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) NODEP=1 $@
    614614!endif
    615615!ifdef PREMAKEFILES
    … …  
    649649!endif
    650650!ifdef SUBDIRS
    651     @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) $@
     651    @$(TOOL_DODIRS) "$(SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
    652652!endif
    653653!ifdef PREMAKEFILES
    … …  
    663663# The $(TARGET) rule - For EXE, DLL, SYS and IFS targets
    664664# -----------------------------------------------------------------------------
    665 !if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
     665!if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
    666666$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF_LINK) $(TARGET_LNK) $(TARGET_DEPS)
     667!if "$(TOOL_JOB_WAIT)" != ""
     668! ifndef BUILD_QUIET
     669   @$(ECHO) Waiting for jobs to complete $(CLRRST)
     670! endif
     671! ifndef BUILD_VERBOSE
     672   @ \
     673! endif
     674   $(TOOL_JOB_WAIT)
     675!endif
    667676    @$(ECHO) Linking $(TARGET_MODE) $(CLRFIL)$@ $(CLRRST)
    668677!ifndef BUILD_VERBOSE
    … …  
    675684    $(LINK_CMD_EXE)
    676685!endif
    677 !if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     686!if "$(TARGET_MODE)" == "DLL"
    678687    $(LINK_CMD_DLL)
    679688!endif
    … …  
    765774!if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFSLIB"
    766775$(TARGET): $(TARGET_OBJS) $(TARGET_LNK) $(TARGET_DEPS)
     776!if "$(TOOL_JOB_WAIT)" != ""
     777! ifndef BUILD_QUIET
     778   @$(ECHO) Waiting for jobs to complete $(CLRRST)
     779! endif
     780! ifndef BUILD_VERBOSE
     781   @ \
     782! endif
     783   $(TOOL_JOB_WAIT)
     784!endif
    767785    @$(ECHO) Creating Library $(CLRFIL)$@ $(CLRRST)
    768786!ifndef BUILD_VERBOSE
    … …  
    786804$(AR_LNK5)
    787805<<KEEP
     806!ifdef BUILD_VERBOSE
     807    @type $@
     808!endif
    788809!endif
    789810
    … …  
    796817    @$(ECHO) Copying $(CLRFIL)$(TARGET)$(CLRTXT) to $(CLRFIL)$(@D)$(CLRRST)
    797818!ifndef BUILD_VERBOSE
     819    @if not exist $(@D) $(ECHO) Target public path $(CLRFIL)$(@D)$(CLRTXT) does NOT exist. Creating. $(CLRRST)
     820!endif
     821    @if not exist $(@D) $(TOOL_CREATEPATH) $(@D)
     822!ifndef BUILD_VERBOSE
    798823    @ \
    799824!endif
    … …  
    850875#
    851876!if [$(TOOL_EXISTS) $(TARGET_DEPEND)] == 0
    852 ! ifndef BUILD_QUIET
     877! ifdef BUILD_VERBOSE
    853878!  if [$(ECHO) Including dependency $(CLRFIL)$(TARGET_DEPEND)$(CLRRST)]
    854879!  endif
    … …  
    868893!ifdef BUILD_DEPEND1
    869894! if [$(TOOL_EXISTS) $(BUILD_DEPEND1)] == 0
    870 !  ifndef BUILD_QUIET
     895!  ifdef BUILD_VERBOSE
    871896!   if [$(ECHO) Including dependency $(CLRFIL)$(BUILD_DEPEND1)$(CLRRST)]
    872897!   endif
    … …  
    883908!ifdef BUILD_DEPEND2
    884909! if [$(TOOL_EXISTS) $(BUILD_DEPEND2)] == 0
    885 !  ifndef BUILD_QUIET
     910!  ifdef BUILD_VERBOSE
    886911!   if [$(ECHO) Including dependency $(CLRFIL)$(BUILD_DEPEND2)$(CLRRST)]
    887912!   endif
    … …  
    899924!ifdef BUILD_DEPEND3
    900925! if [$(TOOL_EXISTS) $(BUILD_DEPEND3)] == 0
    901 !  ifndef BUILD_QUIET
     926!  ifdef BUILD_VERBOSE
    902927!   if [$(ECHO) Including dependency $(CLRFIL)$(BUILD_DEPEND3)$(CLRRST)]
    903928!   endif
    … …  
    915940!endif
    916941
     942
     943#
     944# If BUILD_MULTIJOBS is nonempty make sure the job daemon is up running.
     945#
     946!if "$(BUILD_MULTIJOBS)" != ""
     947! if [$(TOOL_JOB_UP)] != 0
     948!  if "$(BUILD_QUITE)" == ""
     949!   if [$(ECHO) Starting Job Daemon With $(TOOL_JOB_WORKERS) Workers...$(CLRRST)]
     950!   endif
     951!  endif
     952!  if [$(TOOL_JOB_INIT) $(TOOL_JOB_WORKERS)] != 0
     953!   if [$(ECHO) $(CLRERR)Fatal error: Failed to start job daemon.$(CLRRST)]
     954!   endif
     955!   error
     956!  endif
     957! endif
     958!endif
     959

  • trunk/make/setup.mak

    r8353 r8423  
    1 # $Id: setup.mak,v 1.8 2002-04-30 19:48:28 bird Exp $
     1# $Id: setup.mak,v 1.9 2002-05-16 11:37:00 bird Exp $
    22
    33#
    … …  
    160160
    161161# The default definitions.
    162 BUILD_DEFINES           = -D__WIN32OS2__ -D__WINE__ -D__i386__
     162BUILD_DEFINES           = -D__WIN32OS2__ -D__WINE__
    163163BUILD_BLDLEVEL_FLAGS    = -V^"^#define=ODIN32_VERSION,$(PATH_ROOT)\include\odinbuild.h^" \
    164164                          -M^"^#define=ODIN32_BUILD_NR,$(PATH_ROOT)\include\odinbuild.h^"
     165BUILD_PROJECT           = Odin32
    165166
    166167# This is the process file to include at end of the makefile.
    … …  
    219220
    220221# -----------------------------------------------------------------------------
    221 # Ensure the output path exists
    222 # -----------------------------------------------------------------------------
    223 !if "$(PATH_OBJ)" != ""
    224 ! if [$(TOOL_EXISTS) $(PATH_OBJ)] != 0
    225 !  ifndef BUILD_QUIET
    226 !   if [$(ECHO) Target path $(PATH_OBJ) does NOT exist. Creating. $(CLRRST)]
    227 !   endif
    228 !  endif
    229 !  if [$(TOOL_CREATEPATH) $(PATH_OBJ)]
    230 !   error Fatal error: Could not create $(PATH_OBJ).
    231 !  endif
    232 ! endif
    233 !endif
    234 
    235 
    236 
    237 # -----------------------------------------------------------------------------
    238222# Build the environments
    239223# -----------------------------------------------------------------------------
    … …  
    254238
    255239BUILD_ENVS_BASE_POST    = toolkit40
    256 BUILD_ENVS_BASE_PRE     = odin32testcase
    257 
    258 
    259 # Check if there is any change in the environment.
    260 # If there are we will have to forward all target commands to the
     240BUILD_ENVS_BASE_POST_16 =
     241BUILD_ENVS_BASE_PRE     = buildsetup emx cvs
     242BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit40 ddkbase
     243
     244
     245# Check if there is any change in the environment OR if the environment is
     246# uncertain (_BUILD_PROJECT not right).
     247# If there are Then we will have to forward all target commands to the
    261248# correct shell environment
    262 !if "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)" || "$(BUILD_ENVS_PRE)" != "" || "$(BUILD_ENVS_POST)" != ""
     249!if "$(_BUILD_PROJECT)" != "$(BUILD_PROJECT)" || "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)" || "$(BUILD_ENVS_PRE)" != "" || "$(BUILD_ENVS_POST)" != ""
    263250MAKE_INCLUDE_PROCESS = $(PATH_MAKE)\process.forwarder.mak
    264251
     252# set the secret _build_project env.var.
     253!if "$(_BUILD_PROJECT)" != "$(BUILD_PROJECT)"
     254! if [set _BUILD_PROJECT=$(BUILD_PROJECT)]
     255! endif
     256!endif
    265257
    266258# Compiler change or just environment change.
    … …  
    272264!  endif
    273265!  include $(MAKE_INCLUDE_SETUP_FORCE)
     266!  ifdef ENV_16BIT
     267BUILD_ENVS_CHANGE = $(ENV_ENVS: =- )- $(BUILD_ENVS_BASE_PRE_16) $(BUILD_ENVS_PRE) $(ENV_ENVS_FORCE) $(BUILD_ENVS_BASE_POST_16) $(BUILD_ENVS_POST)
     268!  else
    274269BUILD_ENVS_CHANGE = $(ENV_ENVS: =- )- $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS_FORCE) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
     270!  endif
    275271! else
     272!  ifdef ENV_16BIT
     273BUILD_ENVS_CHANGE = $(BUILD_ENVS_BASE_PRE_16) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST_16) $(BUILD_ENVS_POST)
     274!  else
    276275BUILD_ENVS_CHANGE = $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
     276!  endif
    277277! endif
    278278

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

    r8358 r8423  
    1 # $Id: setup.optional.emx.mk,v 1.1 2002-04-30 22:40:17 bird Exp $
     1# $Id: setup.optional.emx.mk,v 1.2 2002-05-16 11:37:00 bird Exp $
    22
    33#

  • trunk/make/setup.os2debalp.mk

    r8253 r8423  
    1 # $Id: setup.os2debalp.mk,v 1.2 2002-04-13 04:39:59 bird Exp $
     1# $Id: setup.os2debalp.mk,v 1.3 2002-05-16 11:37:00 bird Exp $
    22
    33#
    … …  
    99# The flags
    1010#
    11 AS_FLAGS    = -Mb -Sv:ALP +Od -D:DEBUG -D:OS2 $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
     11!include $(PATH_MAKE)\setup.optional.alp.mk
     12AS_FLAGS    =  -D:OS2 -D:DEBUG $(_AS_OPTIONAL) -Mb +Od $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
    1213AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
    1314AS_OBJ_OUT  = -Fo:

  • trunk/make/setup.os2debemx.mk

    r8358 r8423  
    1 # $Id: setup.os2debemx.mk,v 1.1 2002-04-30 22:40:17 bird Exp $
     1# $Id: setup.os2debemx.mk,v 1.2 2002-05-16 11:37:01 bird Exp $
    22
    33# ---OS2, DEBUG, EMX----------------------------
    … …  
    55ENV_STATUS=OK
    66!if "$(ENV_ENVS)" == ""
    7 ENV_ENVS=vac308 emx
     7ENV_ENVS=vac308 emx emxpgcc
    88!else
    9 ENV_ENVS_FORCE=vac308 emx
     9ENV_ENVS_FORCE=vac308 emx emxpgcc
    1010!endif
    1111SPACE=_
     12!undef ENV_16BIT
    1213
    1314
    … …  
    2930# The tools
    3031#
     32!if 1
    3133AR=ilib.exe
     34!else
     35AR=lib.exe
     36!endif
    3237CC=gcc.exe
    3338CXX=gcc.exe
    … …  
    4348#
    4449AR_FLAGS=/nologo /noignorecase
     50!if 1
    4551AR_CMD=$(AR) $(AR_FLAGS) $@ @$(TARGET_LNK)
    4652_AR_LNK1= "$(TARGET_OBJS: ="&^
    4753")"
     54!else
     55_AR_LNK1= $(TARGET), ^
     56+"$(TARGET_OBJS: ="+^
     57")"
     58!endif
    4859AR_LNK1= $(_AR_LNK1:""=)
    4960AR_LNK2= $(@R).lst
    … …  
    7485CXX_PC_2_STDOUT=-C -E
    7586
     87!if "$(CC_AS_CXX)" != ""
     88! if "$(CXX_AS_CC)" != ""
     89!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     90!  endif
     91!  error
     92! endif
     93CC=g++
     94CC_FLAGS_EXE=$(CXX_FLAGS_EXE)
     95CC_FLAGS_DLL=$(CXX_FLAGS_DLL)
     96CC_FLAGS_SYS=$(CXX_FLAGS_SYS)
     97CC_FLAGS_VDD=$(CXX_FLAGS_VDD)
     98CC_FLAGS_IFS=$(CXX_FLAGS_IFS)
     99!endif
     100!if "$(CXX_AS_CC)" != ""
     101! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
     102! endif
     103! error
     104!endif
     105
    76106IMPLIB_FLAGS=/NOI /Nologo
    77107
    … …  
    95125LINK_LNK5=$(TARGET_DEF_LINK)
    96126
    97 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     127RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    98128RL_FLAGS=-x2 -n
    99129

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

    r8359 r8423  
    1 # $Id: setup.os2debmscv6-16.mk,v 1.2 2002-04-30 22:42:49 bird Exp $
     1# $Id: setup.os2debmscv6-16.mk,v 1.3 2002-05-16 11:37:01 bird Exp $
    22
    33# ---OS2, DEBUG, MSCV6-------------------------
    … …  
    128128CXX_PC_2_STDOUT=
    129129
     130!if "$(CC_AS_CXX)" != ""
     131! if [@(ECHO) $(CLRERR)Error: CC_AS_CXX is not supported by this compiler!$(CLRRST)]
     132! endif
     133! error
     134!endif
     135!if "$(CXX_AS_CC)" != ""
     136! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
     137! endif
     138! error
     139!endif
     140
    130141IMPLIB_FLAGS=/NOI /Nologo
    131142
    … …  
    149160LINK_LNK5=$(TARGET_DEF_LINK)
    150161
    151 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     162RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    152163RL_FLAGS=-x2 -n
    153164

  • trunk/make/setup.os2debmscv6.mk

    r8359 r8423  
    1 # $Id: setup.os2debmscv6.mk,v 1.7 2002-04-30 22:42:49 bird Exp $
     1# $Id: setup.os2debmscv6.mk,v 1.8 2002-05-16 11:37:01 bird Exp $
    22
    33# ---OS2, DEBUG, MSCV6-------------------------
    … …  
    99ENV_ENVS_FORCE=vac308 mscv6
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    9798CXX_PC_2_STDOUT=
    9899
     100!if "$(CC_AS_CXX)" != ""
     101! if [@(ECHO) $(CLRERR)Error: CC_AS_CXX is not supported by this compiler!$(CLRRST)]
     102! endif
     103! error
     104!endif
     105!if "$(CXX_AS_CC)" != ""
     106! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
     107! endif
     108! error
     109!endif
     110
    99111IMPLIB_FLAGS=/NOI /Nologo
    100112
    … …  
    118130LINK_LNK5=$(TARGET_DEF_LINK)
    119131
    120 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     132RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    121133RL_FLAGS=-x2 -n
    122134

  • trunk/make/setup.os2debvac308.mk

    r8359 r8423  
    1 # $Id: setup.os2debvac308.mk,v 1.9 2002-04-30 22:42:48 bird Exp $
     1# $Id: setup.os2debvac308.mk,v 1.10 2002-05-16 11:37:01 bird Exp $
    22
    33# ---OS2, DEBUG, VAC308-------------------------
    … …  
    99ENV_ENVS_FORCE=vac308
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    5152CC_PC_2_STDOUT=/Pd+ /P+
    5253
    53 CXX_FLAGS=/Q /DDEBUG /DOS2 /D__32BIT__ /D__i386__ /DMODEL=FLAT /Ti+ /O- /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
     54CXX_FLAGS=/Q /DDEBUG /DOS2 /D__i386__ /DMODEL=FLAT /Ti+ /O- /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    5455CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+
    5556CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge-
    … …  
    6061CXX_LST_OUT=/Fa
    6162CXX_PC_2_STDOUT=/Pd+ /P+
     63
     64!if "$(CC_AS_CXX)" != ""
     65! if "$(CXX_AS_CC)" != ""
     66!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     67!  endif
     68!  error
     69! endif
     70CC=$(CXX)
     71CC_FLAGS_EXE=$(CXX_FLAGS_EXE) /Tdp
     72CC_FLAGS_DLL=$(CXX_FLAGS_DLL) /Tdp
     73CC_FLAGS_SYS=$(CXX_FLAGS_SYS) /Tdp
     74CC_FLAGS_VDD=$(CXX_FLAGS_VDD) /Tdp
     75CC_FLAGS_IFS=$(CXX_FLAGS_IFS) /Tdp
     76!endif
     77!if "$(CXX_AS_CC)" != ""
     78CXX=$(CC)
     79CXX_FLAGS_EXE=$(C_FLAGS_EXE) /Tdc
     80CXX_FLAGS_DLL=$(C_FLAGS_DLL) /Tdc
     81CXX_FLAGS_SYS=$(C_FLAGS_SYS) /Tdc
     82CXX_FLAGS_VDD=$(C_FLAGS_VDD) /Tdc
     83CXX_FLAGS_IFS=$(C_FLAGS_IFS) /Tdc
     84!endif
    6285
    6386IMPLIB_FLAGS=/NOI /Nologo
    … …  
    82105LINK_LNK5=$(TARGET_DEF_LINK)
    83106
    84 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     107RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    85108RL_FLAGS=-x2 -n
    86109

  • trunk/make/setup.os2debvac365.mk

    r8359 r8423  
    1 # $Id: setup.os2debvac365.mk,v 1.8 2002-04-30 22:42:48 bird Exp $
     1# $Id: setup.os2debvac365.mk,v 1.9 2002-05-16 11:37:01 bird Exp $
    22
    33# ---OS2, DEBUG, VAC365-------------------------
    … …  
    99ENV_ENVS_FORCE=vac365
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    5152CC_PC_2_STDOUT=/Pd+ /P+
    5253
    53 CXX_FLAGS=/Q /DDEBUG /DOS2 /D__32BIT__ /D__i386__ /DMODEL=FLAT /Ti+ /O- /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
     54CXX_FLAGS=/Q /DDEBUG /DOS2 /D__i386__ /DMODEL=FLAT /Ti+ /O- /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    5455CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+
    5556CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge-
    … …  
    6061CXX_LST_OUT=/Fa
    6162CXX_PC_2_STDOUT=/Pd+ /P+
     63
     64!if "$(CC_AS_CXX)" != ""
     65! if "$(CXX_AS_CC)" != ""
     66!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     67!  endif
     68!  error
     69! endif
     70CC=$(CXX)
     71CC_FLAGS_EXE=$(CXX_FLAGS_EXE) /Tdp
     72CC_FLAGS_DLL=$(CXX_FLAGS_DLL) /Tdp
     73CC_FLAGS_SYS=$(CXX_FLAGS_SYS) /Tdp
     74CC_FLAGS_VDD=$(CXX_FLAGS_VDD) /Tdp
     75CC_FLAGS_IFS=$(CXX_FLAGS_IFS) /Tdp
     76!endif
     77!if "$(CXX_AS_CC)" != ""
     78CXX=$(CC)
     79CXX_FLAGS_EXE=$(C_FLAGS_EXE) /Tdc
     80CXX_FLAGS_DLL=$(C_FLAGS_DLL) /Tdc
     81CXX_FLAGS_SYS=$(C_FLAGS_SYS) /Tdc
     82CXX_FLAGS_VDD=$(C_FLAGS_VDD) /Tdc
     83CXX_FLAGS_IFS=$(C_FLAGS_IFS) /Tdc
     84!endif
    6285
    6386IMPLIB_FLAGS=/NOI /Nologo
    … …  
    82105LINK_LNK5=$(TARGET_DEF_LINK)
    83106
    84 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     107RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    85108RL_FLAGS=-x2 -n
    86109

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

    r8362 r8423  
    1 # $Id: setup.os2debwat11-16.mk,v 1.2 2002-05-01 04:00:18 bird Exp $
     1# $Id: setup.os2debwat11-16.mk,v 1.3 2002-05-16 11:37:01 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    4242AR_LNK2= $(@R).lst
    4343
    44 _CC_FLAGS_OS =
    45 
    4644CC_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -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
    4745CC_FLAGS_EXE=$(CC_FLAGS)
    … …  
    5452CC_PC_2_STDOUT=-pc
    5553
    56 CXX_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -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
     54CXX_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -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
    5755CXX_FLAGS_EXE=$(CXX_FLAGS)
    5856CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
    … …  
    6462CXX_PC_2_STDOUT=-pc
    6563
     64!if "$(CC_AS_CXX)" != ""
     65! if "$(CXX_AS_CC)" != ""
     66!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     67!  endif
     68!  error
     69! endif
     70CC=$(CXX)
     71CC_FLAGS_EXE=$(CXX_FLAGS_EXE)
     72CC_FLAGS_DLL=$(CXX_FLAGS_DLL)
     73CC_FLAGS_SYS=$(CXX_FLAGS_SYS)
     74CC_FLAGS_VDD=$(CXX_FLAGS_VDD)
     75CC_FLAGS_IFS=$(CXX_FLAGS_IFS)
     76!endif
     77!if "$(CXX_AS_CC)" != ""
     78CXX=$(CC)
     79CXX_FLAGS_EXE=$(C_FLAGS_EXE)
     80CXX_FLAGS_DLL=$(C_FLAGS_DLL)
     81CXX_FLAGS_SYS=$(C_FLAGS_SYS)
     82CXX_FLAGS_VDD=$(C_FLAGS_VDD)
     83CXX_FLAGS_IFS=$(C_FLAGS_IFS)
     84!endif
     85
    6686IMPLIB_FLAGS=/NOI /Nologo
    6787
    68 LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
     88LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact, MAXErrors=20
    6989LINK_FLAGS_EXE=$(LINK_FLAGS)
    7090LINK_FLAGS_DLL=$(LINK_FLAGS)
    … …  
    7999LINK_LNK1=file       $(TARGET_OBJS: =^
    80100file       )
    81 LINK_LNK2=libpath    $(WATCOM)\lib386\os2;$(WATCOM)\lib386;
     101LINK_LNK2=libpath    $(WATCOM)\lib286\os2;$(WATCOM)\lib286;
    82102LINK_LNK3=option map=$(TARGET_MAP)
    83103LINK_LNK4=library    $(TARGET_LIBS: =^, )
    84104LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    85105
    86 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     106RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    87107RL_FLAGS=-x2 -n
    88108
    … …  
    94114#
    95115LIB_OS      = os2286.lib
    96 LIB_C_OBJ   = clib$(_OBJ_MODEL).lib
    97 LIB_C_DLL   = clib$(_OBJ_MODEL).lib # clibdll.lib
    98 LIB_C_RTDLL = clib$(_OBJ_MODEL).lib # clibdll.lib
    99 LIB_C_NRE   = clib$(_OBJ_MODEL).lib
     116
     117_LIB_MT =
     118!if "$(_OBJ_MODEL)" == "m"
     119_LIB_MT = mt # this is the only one there is a MT edition of, don't know why.
     120!endif
     121!if "$(_CXX_XCPT)" != "-xs"
     122LIB_C_OBJ   = clib$(_LIB_MT)$(_OBJ_MODEL).lib plib$(_LIB_MT)$(_OBJ_MODEL).lib math87$(_LIB_MT)$(_OBJ_MODEL).lib emu87.lib
     123!else
     124LIB_C_OBJ   = clib$(_LIB_MT)$(_OBJ_MODEL).lib plbx$(_LIB_MT)$(_OBJ_MODEL).lib math87$(_LIB_MT)$(_OBJ_MODEL).lib emu87.lib
     125!endif
     126LIB_C_DLL   = $(LIB_C_OBJ)  # clibdll.lib
     127LIB_C_RTDLL = $(LIB_C_OBJ)  # clibdll.lib
     128LIB_C_NRE   = $(LIB_C_OBJ)
    100129LIB_C_DMNGL =
    101130OBJ_PROFILE =
    102131
     132
    103133# ---OS2, DEBUG, WAT11-------------------------
    104134

  • trunk/make/setup.os2debwat11.mk

    r8362 r8423  
    1 # $Id: setup.os2debwat11.mk,v 1.7 2002-05-01 04:00:18 bird Exp $
     1# $Id: setup.os2debwat11.mk,v 1.8 2002-05-16 11:37:02 bird Exp $
    22
    33# ---OS2, DEBUG, WAT11-------------------------
    … …  
    99ENV_ENVS_FORCE=vac308 watcomc11c
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    2223#
    2324AR=ilib.exe
     25AR=lib.exe
    2426CC=wcc386.exe
    2527CXX=wpp386.exe
    … …  
    3537#
    3638AR_FLAGS=/nologo /noignorecase
    37 AR_CMD=$(AR) $(AR_FLAGS) $@ @$(TARGET_LNK)
    38 _AR_LNK1= "$(TARGET_OBJS: ="&^
     39AR_CMD=$(AR) $(AR_FLAGS) @$(TARGET_LNK)
     40_AR_LNK1= $(TARGET), ^
     41+"$(TARGET_OBJS: ="+^
    3942")"
    4043AR_LNK1= $(_AR_LNK1:""=)
    … …  
    5154CC_PC_2_STDOUT=-pc
    5255
    53 CXX_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -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
     56CXX_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -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
    5457CXX_FLAGS_EXE=$(CXX_FLAGS)
    5558CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
    … …  
    6063CXX_LST_OUT=
    6164CXX_PC_2_STDOUT=-pc
     65
     66!if "$(CC_AS_CXX)" != ""
     67! if "$(CXX_AS_CC)" != ""
     68!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     69!  endif
     70!  error
     71! endif
     72CC=$(CXX)
     73CC_FLAGS_EXE=$(CXX_FLAGS_EXE)
     74CC_FLAGS_DLL=$(CXX_FLAGS_DLL)
     75CC_FLAGS_SYS=$(CXX_FLAGS_SYS)
     76CC_FLAGS_VDD=$(CXX_FLAGS_VDD)
     77CC_FLAGS_IFS=$(CXX_FLAGS_IFS)
     78!endif
     79!if "$(CXX_AS_CC)" != ""
     80CXX=$(CC)
     81CXX_FLAGS_EXE=$(C_FLAGS_EXE)
     82CXX_FLAGS_DLL=$(C_FLAGS_DLL)
     83CXX_FLAGS_SYS=$(C_FLAGS_SYS)
     84CXX_FLAGS_VDD=$(C_FLAGS_VDD)
     85CXX_FLAGS_IFS=$(C_FLAGS_IFS)
     86!endif
    6287
    6388IMPLIB_FLAGS=/NOI /Nologo
    … …  
    81106LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    82107
    83 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     108RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    84109RL_FLAGS=-x2 -n
    85110
    … …  
    89114#
    90115LIB_OS      = os2386.lib
    91 LIB_C_OBJ   = clib3r.lib
    92 LIB_C_DLL   = clbrdll.lib
    93 LIB_C_RTDLL = clbrdll.lib
    94 LIB_C_NRE   = clib3r.lib
     116!if "$(_CXX_XCPT)" == "-xd"
     117LIB_C_OBJ   = clib3r.lib plibmt3r.lib math387r.lib emu387.lib
     118LIB_C_DLL   = clbrdll.lib plbrdll.lib mt7rdll.lib emu387.lib
     119LIB_C_RTDLL = clbrdll.lib  # TODO
     120LIB_C_NRE   = $(LIB_C_OBJ) # TODO
     121!else
     122LIB_C_OBJ   = clib3r.lib plbxmt3r.lib math387r.lib emu387.lib
     123LIB_C_DLL   = clbrdll.lib plbrdllx.lib mt7rdll.lib emu387.lib
     124LIB_C_RTDLL = clbrdll.lib  # TODO
     125LIB_C_NRE   = $(LIB_C_OBJ) # TODO
     126!endif
    95127LIB_C_DMNGL =
    96128OBJ_PROFILE =

  • trunk/make/setup.os2prfalp.mk

    r8253 r8423  
    1 # $Id: setup.os2prfalp.mk,v 1.2 2002-04-13 04:40:00 bird Exp $
     1# $Id: setup.os2prfalp.mk,v 1.3 2002-05-16 11:37:02 bird Exp $
    22
    33#
    … …  
    99# The flags
    1010#
    11 AS_FLAGS    = -Mb -Sv:ALP +Od -D:DEBUG -D:OS2 $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
     11!include $(PATH_MAKE)\setup.optional.alp.mk
     12AS_FLAGS    = -D:OS2 -D:DEBUG $(_AS_OPTIONAL) -Mb +Od $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
    1213AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
    1314AS_OBJ_OUT  = -Fo:

  • trunk/make/setup.os2prfemx.mk

    r8358 r8423  
    1 # $Id: setup.os2prfemx.mk,v 1.1 2002-04-30 22:40:17 bird Exp $
     1# $Id: setup.os2prfemx.mk,v 1.2 2002-05-16 11:37:03 bird Exp $
    22
    33# ---OS2, PROFILE, EMX----------------------------
    … …  
    55ENV_STATUS=OK
    66!if "$(ENV_ENVS)" == ""
    7 ENV_ENVS=vac308 emx
     7ENV_ENVS=vac308 emx emxpgcc
    88!else
    9 ENV_ENVS_FORCE=vac308 emx
     9ENV_ENVS_FORCE=vac308 emx emxpgcc
    1010!endif
    1111SPACE=_
     12!undef ENV_16BIT
    1213
    1314
    … …  
    7475CXX_PC_2_STDOUT=-C -E
    7576
     77!if "$(CC_AS_CXX)" != ""
     78! if "$(CXX_AS_CC)" != ""
     79!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     80!  endif
     81!  error
     82! endif
     83CC=g++
     84CC_FLAGS_EXE=$(CXX_FLAGS_EXE)
     85CC_FLAGS_DLL=$(CXX_FLAGS_DLL)
     86CC_FLAGS_SYS=$(CXX_FLAGS_SYS)
     87CC_FLAGS_VDD=$(CXX_FLAGS_VDD)
     88CC_FLAGS_IFS=$(CXX_FLAGS_IFS)
     89!endif
     90!if "$(CXX_AS_CC)" != ""
     91! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
     92! endif
     93! error
     94!endif
     95
    7696IMPLIB_FLAGS=/NOI /Nologo
    7797
    … …  
    95115LINK_LNK5=$(TARGET_DEF_LINK)
    96116
    97 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     117RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    98118RL_FLAGS=-x2 -n
    99119

  • trunk/make/setup.os2prfvac308.mk

    r8359 r8423  
    1 # $Id: setup.os2prfvac308.mk,v 1.8 2002-04-30 22:42:48 bird Exp $
     1# $Id: setup.os2prfvac308.mk,v 1.9 2002-05-16 11:37:03 bird Exp $
    22
    33# ---OS2, PROFILE, VAC308-------------------------
    … …  
    99ENV_ENVS_FORCE=vac308
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    5152CC_PC_2_STDOUT=/Pd+ /P+
    5253
    53 CXX_FLAGS=/Q /DDEBUG /DOS2 /D__32BIT__ /D__i386__ /DMODEL=FLAT /Ti+ /O- /Gh+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
     54CXX_FLAGS=/Q /DDEBUG /DOS2 /D__i386__ /DMODEL=FLAT /Ti+ /O- /Gh+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    5455CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+
    5556CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge-
    … …  
    6061CXX_LST_OUT=/Fa
    6162CXX_PC_2_STDOUT=/Pd+ /P+
     63
     64!if "$(CC_AS_CXX)" != ""
     65! if "$(CXX_AS_CC)" != ""
     66!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     67!  endif
     68!  error
     69! endif
     70CC=$(CXX)
     71CC_FLAGS_EXE=$(CXX_FLAGS_EXE) /Tdp
     72CC_FLAGS_DLL=$(CXX_FLAGS_DLL) /Tdp
     73CC_FLAGS_SYS=$(CXX_FLAGS_SYS) /Tdp
     74CC_FLAGS_VDD=$(CXX_FLAGS_VDD) /Tdp
     75CC_FLAGS_IFS=$(CXX_FLAGS_IFS) /Tdp
     76!endif
     77!if "$(CXX_AS_CC)" != ""
     78CXX=$(CC)
     79CXX_FLAGS_EXE=$(C_FLAGS_EXE) /Tdc
     80CXX_FLAGS_DLL=$(C_FLAGS_DLL) /Tdc
     81CXX_FLAGS_SYS=$(C_FLAGS_SYS) /Tdc
     82CXX_FLAGS_VDD=$(C_FLAGS_VDD) /Tdc
     83CXX_FLAGS_IFS=$(C_FLAGS_IFS) /Tdc
     84!endif
    6285
    6386IMPLIB_FLAGS=/NOI /Nologo
    … …  
    82105LINK_LNK5=$(TARGET_DEF_LINK)
    83106
    84 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     107RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    85108RL_FLAGS=-x2 -n
    86109

  • trunk/make/setup.os2prfvac365.mk

    r8359 r8423  
    1 # $Id: setup.os2prfvac365.mk,v 1.8 2002-04-30 22:42:49 bird Exp $
     1# $Id: setup.os2prfvac365.mk,v 1.9 2002-05-16 11:37:03 bird Exp $
    22
    33# ---OS2, PROFILE, VAC365-------------------------
    … …  
    99ENV_ENVS_FORCE=vac365
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    5152CC_PC_2_STDOUT=/Pd+ /P+
    5253
    53 CXX_FLAGS=/Q /DDEBUG /DOS2 /D__32BIT__ /D__i386__ /DMODEL=FLAT /Ti+ /O- /Gh+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
     54CXX_FLAGS=/Q /DDEBUG /DOS2 /D__i386__ /DMODEL=FLAT /Ti+ /O- /Gh+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    5455CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+
    5556CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge-
    … …  
    6061CXX_LST_OUT=/Fa
    6162CXX_PC_2_STDOUT=/Pd+ /P+
     63
     64!if "$(CC_AS_CXX)" != ""
     65! if "$(CXX_AS_CC)" != ""
     66!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     67!  endif
     68!  error
     69! endif
     70CC=$(CXX)
     71CC_FLAGS_EXE=$(CXX_FLAGS_EXE) /Tdp
     72CC_FLAGS_DLL=$(CXX_FLAGS_DLL) /Tdp
     73CC_FLAGS_SYS=$(CXX_FLAGS_SYS) /Tdp
     74CC_FLAGS_VDD=$(CXX_FLAGS_VDD) /Tdp
     75CC_FLAGS_IFS=$(CXX_FLAGS_IFS) /Tdp
     76!endif
     77!if "$(CXX_AS_CC)" != ""
     78CXX=$(CC)
     79CXX_FLAGS_EXE=$(C_FLAGS_EXE) /Tdc
     80CXX_FLAGS_DLL=$(C_FLAGS_DLL) /Tdc
     81CXX_FLAGS_SYS=$(C_FLAGS_SYS) /Tdc
     82CXX_FLAGS_VDD=$(C_FLAGS_VDD) /Tdc
     83CXX_FLAGS_IFS=$(C_FLAGS_IFS) /Tdc
     84!endif
    6285
    6386IMPLIB_FLAGS=/NOI /Nologo
    … …  
    82105LINK_LNK5=$(TARGET_DEF_LINK)
    83106
    84 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     107RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    85108RL_FLAGS=-x2 -n
    86109
    … …  
    89112# Libraries and object files.
    90113#
    91 LIB_OS      = _DOSCALL.LIB _PMGPI.LIB _PMWIN.LIB os2386.lib
     114#LIB_OS      = _DOSCALL.LIB _PMGPI.LIB _PMWIN.LIB os2386.lib
     115LIB_OS      = os2386.lib
    92116LIB_C_OBJ   = cpprms36.lib
    93117LIB_C_DLL   = cpprmi36.lib

  • trunk/make/setup.os2relalp.mk

    r8253 r8423  
    1 # $Id: setup.os2relalp.mk,v 1.2 2002-04-13 04:40:00 bird Exp $
     1# $Id: setup.os2relalp.mk,v 1.3 2002-05-16 11:37:04 bird Exp $
    22
    33#
    … …  
    99# The flags
    1010#
    11 AS_FLAGS    = -Mb -Sv:ALP +Od -D:DEBUG -D:OS2 $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
     11!include $(PATH_MAKE)\setup.optional.alp.mk
     12AS_FLAGS    = -D:OS2 $(_AS_OPTIONAL) -Mb +Od $(AS_DEFINES:-D=-D:) $(ALL_INCLUDES:-I=-i:) $(AS_INCLUDES:-I=-i:) $(ALL_DEFINES:-D=-D:) -i:$(PATH_INCLUDES) $(BUILD_DEFINES:-D=-D:)
    1213AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
    1314AS_OBJ_OUT= -Fo:

  • trunk/make/setup.os2relemx.mk

    r8358 r8423  
    1 # $Id: setup.os2relemx.mk,v 1.1 2002-04-30 22:40:18 bird Exp $
     1# $Id: setup.os2relemx.mk,v 1.2 2002-05-16 11:37:04 bird Exp $
    22
    33# ---OS2, DEBUG, EMX----------------------------
    … …  
    55ENV_STATUS=OK
    66!if "$(ENV_ENVS)" == ""
    7 ENV_ENVS=vac308 emx
     7ENV_ENVS=vac308 emx emxpgcc
    88!else
    9 ENV_ENVS_FORCE=vac308 emx
     9ENV_ENVS_FORCE=vac308 emx emxpgcc
    1010!endif
     11!undef ENV_16BIT
    1112SPACE=_
    1213
    … …  
    7475CXX_PC_2_STDOUT=-C -E
    7576
     77!if "$(CC_AS_CXX)" != ""
     78! if "$(CXX_AS_CC)" != ""
     79!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     80!  endif
     81!  error
     82! endif
     83CC=g++
     84CC_FLAGS_EXE=$(CXX_FLAGS_EXE)
     85CC_FLAGS_DLL=$(CXX_FLAGS_DLL)
     86CC_FLAGS_SYS=$(CXX_FLAGS_SYS)
     87CC_FLAGS_VDD=$(CXX_FLAGS_VDD)
     88CC_FLAGS_IFS=$(CXX_FLAGS_IFS)
     89!endif
     90!if "$(CXX_AS_CC)" != ""
     91! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
     92! endif
     93! error
     94!endif
     95
    7696IMPLIB_FLAGS=/NOI /Nologo
    7797
    … …  
    95115LINK_LNK5=$(TARGET_DEF_LINK)
    96116
    97 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     117RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    98118RL_FLAGS=-x2 -n
    99119

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

    r8359 r8423  
    1 # $Id: setup.os2relmscv6-16.mk,v 1.2 2002-04-30 22:42:49 bird Exp $
     1# $Id: setup.os2relmscv6-16.mk,v 1.3 2002-05-16 11:37:04 bird Exp $
    22
    33# ---OS2, RELEASE, MSCV6-------------------------
    … …  
    103103_CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL)
    104104
    105 CC_FLAGS=/nologo /c /DDEBUG /DOS2 /D__16BIT__ /W0 /G2 /Ogeitln /Zi $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
     105CC_FLAGS=/nologo /c /DOS2 /D__16BIT__ /W0 /G2 /Ogeitln /Zi $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    106106CC_FLAGS_EXE=$(CC_FLAGS)
    107107CC_FLAGS_DLL=$(CC_FLAGS)
    … …  
    120120CXX_LST_OUT=
    121121CXX_PC_2_STDOUT=
     122
     123!if "$(CC_AS_CXX)" != ""
     124! if [@(ECHO) $(CLRERR)Error: CC_AS_CXX is not supported by this compiler!$(CLRRST)]
     125! endif
     126! error
     127!endif
     128!if "$(CXX_AS_CC)" != ""
     129! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
     130! endif
     131! error
     132!endif
    122133
    123134IMPLIB_FLAGS=/NOI /Nologo
    … …  
    142153LINK_LNK5=$(TARGET_DEF_LINK)
    143154
    144 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     155RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    145156RL_FLAGS=-x2 -n
    146157

  • trunk/make/setup.os2relmscv6.mk

    r8359 r8423  
    1 # $Id: setup.os2relmscv6.mk,v 1.7 2002-04-30 22:42:49 bird Exp $
     1# $Id: setup.os2relmscv6.mk,v 1.8 2002-05-16 11:37:04 bird Exp $
    22
    33# ---OS2, RELEASE, MSCV6-------------------------
    … …  
    99ENV_ENVS_FORCE=vac308 mscv6
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    9798CXX_PC_2_STDOUT=
    9899
     100!if "$(CC_AS_CXX)" != ""
     101! if [@(ECHO) $(CLRERR)Error: CC_AS_CXX is not supported by this compiler!$(CLRRST)]
     102! endif
     103! error
     104!endif
     105!if "$(CXX_AS_CC)" != ""
     106! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
     107! endif
     108! error
     109!endif
     110
    99111IMPLIB_FLAGS=/NOI /Nologo
    100112
    … …  
    118130LINK_LNK5=$(TARGET_DEF_LINK)
    119131
    120 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     132RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    121133RL_FLAGS=-x2 -n
    122134

  • trunk/make/setup.os2relvac308.mk

    r8359 r8423  
    1 # $Id: setup.os2relvac308.mk,v 1.8 2002-04-30 22:42:49 bird Exp $
     1# $Id: setup.os2relvac308.mk,v 1.9 2002-05-16 11:37:04 bird Exp $
    22
    33# ---OS2, RELEASE, VAC308-------------------------
    … …  
    99ENV_ENVS_FORCE=vac308
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    5152CC_PC_2_STDOUT=/Pd+ /P+
    5253
    53 CXX_FLAGS=/Q /DOS2 /D__32BIT__ /D__i386__ /DMODEL=FLAT /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
     54CXX_FLAGS=/Q /DOS2 /D__i386__ /DMODEL=FLAT /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    5455CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+
    5556CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge-
    … …  
    6061CXX_LST_OUT=/Fa
    6162CXX_PC_2_STDOUT=/Pd+ /P+
     63
     64!if "$(CC_AS_CXX)" != ""
     65! if "$(CXX_AS_CC)" != ""
     66!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     67!  endif
     68!  error
     69! endif
     70CC=$(CXX)
     71CC_FLAGS_EXE=$(CXX_FLAGS_EXE) /Tdp
     72CC_FLAGS_DLL=$(CXX_FLAGS_DLL) /Tdp
     73CC_FLAGS_SYS=$(CXX_FLAGS_SYS) /Tdp
     74CC_FLAGS_VDD=$(CXX_FLAGS_VDD) /Tdp
     75CC_FLAGS_IFS=$(CXX_FLAGS_IFS) /Tdp
     76!endif
     77!if "$(CXX_AS_CC)" != ""
     78CXX=$(CC)
     79CXX_FLAGS_EXE=$(C_FLAGS_EXE) /Tdc
     80CXX_FLAGS_DLL=$(C_FLAGS_DLL) /Tdc
     81CXX_FLAGS_SYS=$(C_FLAGS_SYS) /Tdc
     82CXX_FLAGS_VDD=$(C_FLAGS_VDD) /Tdc
     83CXX_FLAGS_IFS=$(C_FLAGS_IFS) /Tdc
     84!endif
    6285
    6386IMPLIB_FLAGS=/NOI /Nologo
    … …  
    82105LINK_LNK5=$(TARGET_DEF_LINK)
    83106
    84 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     107RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    85108RL_FLAGS=-x2 -n
    86109

  • trunk/make/setup.os2relvac365.mk

    r8359 r8423  
    1 # $Id: setup.os2relvac365.mk,v 1.8 2002-04-30 22:42:49 bird Exp $
     1# $Id: setup.os2relvac365.mk,v 1.9 2002-05-16 11:37:05 bird Exp $
    22
    33# ---OS2, RELEASE, VAC365-------------------------
    … …  
    99ENV_ENVS_FORCE=vac365
    1010!endif
     11!undef ENV_16BIT
    1112
    1213
    … …  
    5152CC_PC_2_STDOUT=/Pd+ /P+
    5253
    53 CXX_FLAGS=/Q /DOS2 /D__32BIT__ /D__i386__ /DMODEL=FLAT /Ti+ /O+ /G5 /qtune=pentium2 /Gf+ /Gi+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
     54CXX_FLAGS=/Q /DOS2 /D__i386__ /DMODEL=FLAT /Ti+ /O+ /G5 /qtune=pentium2 /Gf+ /Gi+ /Ss+ /C+ $(_CXX_OPTIONAL) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    5455CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+
    5556CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge-
    … …  
    6061CXX_LST_OUT=/Fa
    6162CXX_PC_2_STDOUT=/Pd+ /P+
     63
     64!if "$(CC_AS_CXX)" != ""
     65! if "$(CXX_AS_CC)" != ""
     66!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
     67!  endif
     68!  error
     69! endif
     70CC=$(CXX)
     71CC_FLAGS_EXE=$(CXX_FLAGS_EXE) /Tdp
     72CC_FLAGS_DLL=$(CXX_FLAGS_DLL) /Tdp
     73CC_FLAGS_SYS=$(CXX_FLAGS_SYS) /Tdp
     74CC_FLAGS_VDD=$(CXX_FLAGS_VDD) /Tdp
     75CC_FLAGS_IFS=$(CXX_FLAGS_IFS) /Tdp
     76!endif
     77!if "$(CXX_AS_CC)" != ""
     78CXX=$(CC)
     79CXX_FLAGS_EXE=$(C_FLAGS_EXE) /Tdc
     80CXX_FLAGS_DLL=$(C_FLAGS_DLL) /Tdc
     81CXX_FLAGS_SYS=$(C_FLAGS_SYS) /Tdc
     82CXX_FLAGS_VDD=$(C_FLAGS_VDD) /Tdc
     83CXX_FLAGS_IFS=$(C_FLAGS_IFS) /Tdc
     84!endif
    6285
    6386IMPLIB_FLAGS=/NOI /Nologo
    … …  
    82105LINK_LNK5=$(TARGET_DEF_LINK)
    83106
    84 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     107RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
    85108RL_FLAGS=-x2 -n
    86109

  • trunk/make/setup.tools.mk

    r8333 r8423  
    1 # $Id: setup.tools.mk,v 1.7 2002-04-30 06:19:13 bird Exp $
     1# $Id: setup.tools.mk,v 1.8 2002-05-16 11:37:05 bird Exp $
    22
    33
    … …  
    77#
    88!ifdef SLKRUNS
    9 BUILD_NOCOLORS = 1;
     9BUILD_NOCOLORS = 1
    1010!endif
    1111!ifndef BUILD_NOCOLORS
    … …  
    2929TOOL_BUILDENV   = $(PATH_TOOLS)\BuildEnv.cmd
    3030TOOL_CMP        = $(PATH_TOOLS)\cmp.exe
     31TOOL_CMDQD      = $(PATH_TOOLS)\cmdqd.exe
    3132!if "$(BUILD_SHELL)" != "4OS2"
    3233TOOL_COPY       = copy
    … …  
    4445TOOL_ECHO       = @echo $(CLRTXT)
    4546TOOL_EXISTS     = $(PATH_TOOLS)\Exists.cmd
    46 TOOL_MAKE       = $(MAKE) -nologo
     47!if "$(BUILD_MULTIJOBS)" != ""
     48TOOL_JOB_SUB    = $(TOOL_CMDQD) submit
     49TOOL_JOB_WAIT   = $(TOOL_CMDQD) wait
     50TOOL_JOB_UP     = $(TOOL_CMDQD) queryrunning
     51TOOL_JOB_INIT   = $(TOOL_CMDQD) init
     52TOOL_JOB_WORKERS= 5
     53TOOL_JOB_SUB_MSG= (submitting job)
     54!endif
     55TOOL_MAKE       = $(MAKE:.exe=).exe -nologo
    4756TOOL_MAPSYM     = $(PATH_TOOLS)\MapSym.cmd $(BUILD_ENV)
    4857TOOL_RM         = rm.exe -f
    4958TOOL_TYPE       = type
     59
     60
     61#
     62# Check for all mode and modify some tool flags
     63#
     64!ifdef MAKEFLAGS
     65!if "$(MAKEVER)" != "5.0"
     66!if "$(MAKEFLAGS:A=z)" != "$(MAKEFLAGS)"
     67TOOL_DEP_FLAGS = $(TOOL_DEP_FLAGS) -F+
     68!endif
     69!else
     70!if "$(MAKEFLAGS:a=z)" != "$(MAKEFLAGS)"
     71TOOL_DEP_FLAGS += -F+
     72!endif
     73!endif
     74!endif
    5075
    5176
Note: See TracChangeset for help on using the changeset viewer.