Changeset 8253


Ignore:
Timestamp:
Apr 13, 2002, 6:40:01 AM (24 years ago)
Author:
bird
Message:

Cleanups. Fixed some issues.

Location:
trunk/make
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/make/process.mak

    r8213 r8253  
    1 # $Id: process.mak,v 1.2 2002-04-07 22:43:25 bird Exp $
     1# $Id: process.mak,v 1.3 2002-04-13 04:39:59 bird Exp $
    22
    33#
    … …  
    1010#
    1111
    12 #
    13 # This makefile expects setup.mak and the specific setup to be included
    14 # already. Plus there are several prerequisite environment variables
    15 # subsystem makefiles need to set:
    16 # TARGET_NAME is obligatory
    17 
    18 !ifndef TARGET_NAME
    19 !error fatal error: TARGET_NAME is not defined!
    20 !endif
    21 
    22 # provide overridable defaults
     12
     13# -----------------------------------------------------------------------------
     14# Assertions.
     15#   This makefile expects setup.mak and the specific setup to be included
     16#   already.
     17#   It also requires the TARGET_NAME to be specified in the makefile.
     18# -----------------------------------------------------------------------------
     19!if "$(MAKE_SETUP_INCLUDED)" != "YES"
     20!error Fatal error: You must include setup.mak before process.mak in the makefile.
     21!endif
     22!if "$(ENV_STATUS)" != "OK"
     23!error Fatal error: The enironment 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.
     28!endif
     29
     30# -----------------------------------------------------------------------------
     31# Provide overridable defaults
     32# -----------------------------------------------------------------------------
     33
     34# Default target mode is executable.
     35!ifndef TARGET_MODE
     36TARGET_MODE = EXE
     37!endif
     38
     39# Default extension corresponds to the target mode.
     40!ifndef TARGET_EXT
     41! if "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "DLL"
     42TARGET_EXT  = $(EXT_DLL)
     43! endif
     44! if "$(TARGET_MODE)" == "SYS"
     45TARGET_EXT  = $(EXT_SYS)
     46! endif
     47! if "$(TARGET_MODE)" == "EXE"
     48TARGET_EXT  = $(EXT_EXE)
     49! endif
     50! if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "PUBLIB" || "$(TARGET_MODE)" == "SYSLIB"
     51TARGET_EXT  = $(EXT_LIB)
     52! endif
     53! if "$(TARGET_MODE)" == "EMPTY"
     54TARGET_EXT  = empty
     55! endif
     56! ifndef TARGET_EXT
     57!error Error: TARGET_EXT not set
     58! endif
     59!endif
     60
     61# Default target path. (where all the generated stuff for this target goes)
     62!ifndef PATH_TARGET
     63PATH_TARGET = $(PATH_OBJ)\$(TARGET_NAME).$(TARGET_EXT)
     64!endif
     65
     66# Default target file. (output)
    2367!ifndef TARGET
    24 TARGET=$(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
    25 !endif
    26 
     68TARGET      = $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
     69!endif
     70
     71# Default object file. (output)
    2772!ifndef TARGET_OBJS
    28 TARGET_OBJS=$(PATH_TARGET)\$(TARGET_NAME).$(EXT_OBJ)
    29 !endif
    30 
     73TARGET_OBJS = $(PATH_TARGET)\$(TARGET_NAME).$(EXT_OBJ)
     74!endif
     75
     76# Default libraries. (input)
    3177!ifndef TARGET_LIBS
    32 TARGET_LIBS=$(LIB_C_DLL) $(LIB_OS) $(LIB_C_RTDLL)
    33 !endif
    34 
     78TARGET_LIBS = $(LIB_C_DLL) $(LIB_OS) $(LIB_C_RTDLL)
     79!endif
     80
     81# Default definition file. (input)
    3582!ifndef TARGET_DEF
    36 TARGET_DEF=$(MAKEDIR)\$(PATH_DEF)\$(TARGET_NAME).def
    37 !endif
    38 
     83TARGET_DEF  = $(MAKEDIR)\$(PATH_DEF)\$(TARGET_NAME).def
     84!endif
     85
     86# Default definition file for generating the import library. (input)
    3987!ifndef TARGET_IDEF
    40 TARGET_IDEF=$(TARGET_DEF)
    41 !endif
    42 
     88TARGET_IDEF = $(TARGET_DEF)
     89!endif
     90
     91# Default map file. (output)
    4392!ifndef TARGET_MAP
    44 TARGET_MAP=$(PATH_TARGET)\$(TARGET_NAME).map
    45 !endif
    46 
     93TARGET_MAP  = $(PATH_TARGET)\$(TARGET_NAME).map
     94!endif
     95
     96# Default link file. (output)
    4797!ifndef TARGET_LNK
    48 TARGET_LNK=$(PATH_TARGET)\$(TARGET_NAME).lnk
    49 !endif
    50 
    51 !ifndef TARGET_MODE
    52 TARGET_MODE=EXE
    53 !endif
    54 
    55 !ifndef TARGET_EXT
    56 !if "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "DLL"
    57 TARGET_EXT=$(EXT_DLL)
    58 !endif
    59 !if "$(TARGET_MODE)" == "SYS"
    60 TARGET_EXT=$(EXT_SYS)
    61 !endif
    62 !if "$(TARGET_MODE)" == "EXE"
    63 TARGET_EXT=$(EXT_EXE)
    64 !endif
    65 !if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "PUBLIB" || "$(TARGET_MODE)" == "SYSLIB"
    66 TARGET_EXT=$(EXT_LIB)
    67 !endif
    68 !if "$(TARGET_MODE)" == "EMPTY"
    69 TARGET_EXT=empty
    70 !endif
    71 !ifndef TARGET_EXT
    72 !error Error: TARGET_EXT not set
    73 !endif
    74 !endif
    75 
     98TARGET_LNK  = $(PATH_TARGET)\$(TARGET_NAME).lnk
     99!endif
     100
     101# Default import library file. (output)
    76102!ifndef TARGET_ILIB
    77 !if "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "DLL"
    78 TARGET_ILIB=$(PATH_LIB)\$(TARGET_NAME).$(EXT_ILIB)
    79 !endif
    80 !endif
    81 
    82 !if "$(TARGET_MODE)" == "PUBLIB"
     103! if "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "DLL"
     104TARGET_ILIB =$(PATH_LIB)\$(TARGET_NAME).$(EXT_ILIB)
     105! endif
     106!endif
     107
     108# Default public library name. (output)
     109!ifndef TARGET_PUBLIB
     110! if "$(TARGET_MODE)" == "PUBLIB"
    83111TARGET_PUBLIB=$(PATH_LIB)\$(TARGET_NAME).$(TARGET_EXT)
    84 !else
     112! else
    85113TARGET_PUBLIB=
    86 !endif
    87 
    88 
     114! endif
     115!endif
     116
     117# Default depend filename.
     118!ifndef TARGET_DEPEND
     119TARGET_DEPEND = $(PATH_TARGET)\.depend
     120!endif
     121
     122# Default makefile name.
     123!ifndef MAKEFILE
     124MAKEFILE = makefile
     125!endif
     126
     127# Ignore linker warnings for some target modes.
     128!ifndef TARGET_IGNORE_LINKER_WARNINGS
     129! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     130TARGET_IGNORE_LINKER_WARNINGS = 1
     131! endif
     132!endif
     133
     134
     135# Default stacksize
     136#
     137# BUGBUG/TODO/FIXME
     138# kso:  Not sure if this is the *right* way to represent it!
     139#       It can't be when we start changing it based on the
     140#       current build environment.
    89141!ifndef TARGET_STACKSIZE
    90142# check if 16-bit target compiler
    … …  
    96148!endif
    97149
    98 !ifndef MAKEFILE
    99 MAKEFILE = makefile
    100 !endif
    101 
    102 
    103 # ensure the platform-specific target path exists
    104 PATH_TARGET=$(PATH_OBJ)\$(TARGET_NAME).$(TARGET_EXT)
    105 !if "$(PATH_TARGET)" != ""
    106 ! if [$(TOOL_EXISTS) $(PATH_TARGET)] != 0
    107 !  if [$(ECHO) Target path $(CLRFIL)$(PATH_TARGET)$(CLRTXT) does NOT exist. Creating. $(CLRRST)]
     150
     151
     152# -----------------------------------------------------------------------------
     153# Tell user what we're building.
     154# -----------------------------------------------------------------------------
     155!ifndef BUILD_QUIET
     156!if [$(ECHO) Target is $(CLRFIL)$(TARGET)$(CLRRST)]
     157!endif
     158!endif
     159
     160
     161# -----------------------------------------------------------------------------
     162# Ensure the platform-specific target path exists
     163# -----------------------------------------------------------------------------
     164
     165!if "$(TARGET_MODE)" != "EMPTY"
     166! if "$(PATH_TARGET)" != ""
     167!  if [$(TOOL_EXISTS) $(PATH_TARGET)] != 0
     168!   ifndef BUILD_QUIET
     169!    if [$(ECHO) Target path $(CLRFIL)$(PATH_TARGET)$(CLRTXT) does NOT exist. Creating. $(CLRRST)]
     170!    endif
     171!   endif
     172!   if [$(TOOL_CREATEPATH) $(PATH_TARGET)]
     173!    error Could not create $(PATH_TARGET)
     174!   endif
    108175!  endif
    109 !  if [$(TOOL_CREATEPATH) $(PATH_TARGET)]
    110 !   error Could not create $(PATH_TARGET)
    111 !  endif
    112 ! endif
    113 !endif
    114 
    115 
    116 # Tell user what we're building.
    117 !if [$(ECHO) Target is $(CLRFIL)$(TARGET)$(CLRRST)]
    118 !endif
    119 
    120 
    121 # build the target filenames
    122 BUILD_TARGET_DEPEND=$(PATH_TARGET)\.depend
    123 
    124 
    125 # ----------------------
    126 # common inference rules
    127 # ----------------------
     176! endif
     177!endif
     178# not 100% sure about the != EMPTY stuff, but this is way faster.
     179
     180
     181
     182# -----------------------------------------------------------------------------
     183# Common inference rules
     184# -----------------------------------------------------------------------------
    128185
    129186.SUFFIXES:
    … …  
    168225        $(CXX_FLAGS_IFS) \
    169226!endif
    170 !ifdef CXX_LST_OUT
     227!if "$(CXX_LST_OUT)" != ""
    171228        $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
    172229!endif
    … …  
    191248        $(CXX_FLAGS_IFS) \
    192249!endif
    193 !ifdef CXX_LST_OUT
     250!if "$(CXX_LST_OUT)" != ""
    194251        $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
    195252!endif
    … …  
    238295        $(CC_FLAGS_IFS) \
    239296!endif
    240 !ifdef CC_LST_OUT
     297!if "$(CC_LST_OUT)" != ""
    241298        $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
    242299!endif
    … …  
    261318        $(CC_FLAGS_IFS) \
    262319!endif
    263 !ifdef CC_LST_OUT
     320!if "$(CC_LST_OUT)" != ""
    264321        $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
    265322!endif
    … …  
    299356
    300357
    301 #
    302 # establish root dependency
    303 # by removing the extension from the BUILD_TARGET
    304 # and replacing it with .obj
    305 #
     358
     359
     360
     361# -----------------------------------------------------------------------------
     362# The all rule - The default one, as it's the first rule in the file.
     363# -----------------------------------------------------------------------------
    306364all: build
    307365
    308366
    309 #
    310 # Build the main target.
    311 #
     367
     368# -----------------------------------------------------------------------------
     369# The build rule - Build the target.
     370#   Must take into account any subdirectories and makefiles which is is to be
     371#   made before and after the target. That makes it kind of messy, sorry.
     372# -----------------------------------------------------------------------------
    312373!ifdef SUBDIRS
    313374SUBDIRS_BUILD = subbuild
    … …  
    329390
    330391
    331 #
    332 # Make Public libraries.
    333 #
     392
     393# -----------------------------------------------------------------------------
     394# The lib rule - Make Public libraries.
     395#   Must take into account any subdirectories and makefiles which is is to be
     396#   made before and after the target. That makes it kind of messy, sorry.
     397# -----------------------------------------------------------------------------
    334398!ifdef SUBDIRS
    335399SUBDIRS_LIB = subdir_lib
    … …  
    350414
    351415
    352 #
    353 # Copies target to main binary directory.
    354 #
     416
     417# -----------------------------------------------------------------------------
     418# The install rule - Copies target to main binary directory.
     419#   Installation order is not concidered vital, so subdirectories and
     420#   pre-makefiles are processed after this directory. This might be changed.
     421# -----------------------------------------------------------------------------
    355422install:
    356423!if "$(TARGET_MODE)" == "EXE"
    … …  
    363430    if exist $(TARGET) $(TOOL_COPY) $(TARGET) $(PATH_SYS)
    364431!endif
    365 !if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "PUBLIB" || "$(TARGET_MODE)" == "SYSLIB"
     432!if 0
     433# Nothing to do here currently. These are either private or they're allready where they should be.
     434#
     435# TODO/BUGBUG/FIXME:
     436#       The PUB stuff should be change to a separate variable.
     437#       It will make life easier to just state that this target,
     438#       what ever it is, should be public.
     439#
     440#       That's allow project to install targets during make without
     441#       running the install command by setting some target modes
     442#       public by default.
     443#   (kso)
     444#!if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "PUBLIB" || "$(TARGET_MODE)" == "SYSLIB"
    366445#    if exist $(TARGET) $(TOOL_COPY) $(TARGET) $(PATH_LIB)
     446#!endif
    367447!endif
    368448!if "$(TARGET_DOCS)" != ""
    … …  
    380460
    381461
    382 #
    383 # Run evt. testcase
    384 #
     462
     463# -----------------------------------------------------------------------------
     464# The testcase rule - Execute testcases when present.
     465#   Testcases are either a testcase.mak file or a testcase subdirectory.
     466# -----------------------------------------------------------------------------
    385467!ifndef BUILD_NO_TESTCASE
    386468testcase: install
    … …  
    403485
    404486
    405 #
    406 # Make dependencies.
    407 #
     487
     488# -----------------------------------------------------------------------------
     489# The dep rule - Make dependencies.
     490# -----------------------------------------------------------------------------
    408491dep:
    409492    @$(ECHO) Building dependencies $(CLRRST)
    410     @$(TOOL_DEP) $(TOOL_DEP_FLAGS) -o$$(PATH_TARGET) -d$(BUILD_TARGET_DEPEND)\
     493    @$(TOOL_DEP) $(TOOL_DEP_FLAGS) -o$$(PATH_TARGET) -d$(TARGET_DEPEND)\
    411494!ifdef TARGET_NO_DEP
    412495        -x$(TARGET_NO_DEP: =;)\
    … …  
    424507
    425508
    426 #
    427 # Clean up output files (not the installed ones).
    428 #
     509
     510# -----------------------------------------------------------------------------
     511# The clean rule - Clean up output files.
     512#   The current setup doesn't clean the installed ones.
     513# -----------------------------------------------------------------------------
    429514clean:
    430515!if "$(PATH_TARGET)" != ""              # paranoia
    … …  
    458543
    459544
    460 #
    461 # EXE, DLL, SYS and IFS Targets
    462 #
     545
     546# -----------------------------------------------------------------------------
     547# The $(TARGET) rule - For EXE, DLL, SYS and IFS targets
     548# -----------------------------------------------------------------------------
    463549!if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS"
    464 ! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
    465 TARGET_IGNORE_LINKER_WARNINGS=1
    466 !endif
    467550$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF) $(TARGET_LNK) $(TARGET_DEPS)
    468551    @$(ECHO) Linking $(TARGET_MODE) $(CLRFIL)$@ $(CLRRST)
    … …  
    471554!endif
    472555!if "$(TARGET_MODE)" == "EXE"
    473     @$(LINK_CMD_EXE)
     556    $(LINK_CMD_EXE)
    474557!endif
    475558!if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
    … …  
    505588
    506589
    507 #
    508 # DLL Import library
    509 #
    510 !ifdef TARGET_ILIB
    511 $(TARGET_ILIB): $(TARGET_IDEF)
    512     @$(ECHO) Creating Import Library $(CLRFIL)$@ $(CLRRST)
    513     $(IMPLIB) $(IMPLIB_FLAGS) $@ $(TARGET_IDEF)
    514 !endif
    515 !endif
    516 
    517 
    518 #
    519 # Lib Targets.
    520 #
     590
     591# -----------------------------------------------------------------------------
     592# The $(TARGET) rule - For LIB, PUBLIB, and SYSLIB targets.
     593# -----------------------------------------------------------------------------
    521594!if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "PUBLIB" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFSLIB"
    522595$(TARGET): $(TARGET_OBJS) $(TARGET_LNK) $(TARGET_DEPS)
    … …  
    542615#
    543616# Copy rule for public libraries.
     617#   BUGBUG/TODO/FIXME: get rid of the PUBLIB stuff. see commet in install.
    544618#
    545619!if "$(TARGET_MODE)" == "PUBLIB"
    … …  
    550624
    551625
    552 #
    553 # Empty target.
    554 #
     626
     627# -----------------------------------------------------------------------------
     628# The $(TARGET) rule - For EMPTY targets.
     629# -----------------------------------------------------------------------------
    555630!if "$(TARGET_MODE)" == "EMPTY"
    556631$(TARGET):
    … …  
    559634
    560635
    561 #
    562 # read dependency file from current directory
    563 #
     636
     637# -----------------------------------------------------------------------------
     638# The $(TARGET_ILIB) rule - Make import library.
     639# -----------------------------------------------------------------------------
     640!ifdef TARGET_ILIB
     641$(TARGET_ILIB): $(TARGET_IDEF)
     642    @$(ECHO) Creating Import Library $(CLRFIL)$@ $(CLRRST)
     643    $(IMPLIB) $(IMPLIB_FLAGS) $@ $(TARGET_IDEF)
     644!endif
     645!endif
     646
     647
     648
     649# -----------------------------------------------------------------------------
     650# The .force rule - Force a remake of something everytime.
     651# -----------------------------------------------------------------------------
     652.force:
     653    @$(ECHO) .
     654
     655
     656
     657# -----------------------------------------------------------------------------
     658# Read Dependencies.
     659# -----------------------------------------------------------------------------
     660
    564661!if "$(TARGET_MODE)" != "EMPTY"
    565 ! if [$(TOOL_EXISTS) $(BUILD_TARGET_DEPEND)] == 0
    566 !  if [$(ECHO) Including dependency $(CLRFIL)$(BUILD_TARGET_DEPEND)$(CLRRST)]
     662
     663#
     664# Read dependency file for current directory
     665#
     666!if [$(TOOL_EXISTS) $(TARGET_DEPEND)] == 0
     667! ifndef BUILD_QUIET
     668!  if [$(ECHO) Including dependency $(CLRFIL)$(TARGET_DEPEND)$(CLRRST)]
    567669!  endif
    568 !  include $(BUILD_TARGET_DEPEND)
     670! endif
     671! include $(TARGET_DEPEND)
     672!else
     673! ifndef NODEP
     674!   if [$(ECHO) $(CLRERR)WARNING: Please make dependencies first. $(TARGET_DEPEND) is missing.$(CLRRST)]
     675!   endif
     676! endif
     677!endif
     678
     679
     680#
     681# Read global dependency files.
     682#
     683!ifdef BUILD_DEPEND1
     684! if [$(TOOL_EXISTS) $(BUILD_DEPEND1)] == 0
     685!  ifndef BUILD_QUIET
     686!   if [$(ECHO) Including dependency $(CLRFIL)$(BUILD_DEPEND1)$(CLRRST)]
     687!   endif
     688!  endif
     689!  include $(BUILD_DEPEND1)
    569690! else
    570691!  ifndef NODEP
    571 !    if [$(ECHO) $(CLRERR)WARNING: Please make dependencies first. $(BUILD_TARGET_DEPEND) is missing.$(CLRRST)]
     692!    if [$(ECHO) $(CLRERR)WARNING: Please make dependencies first. $(BUILD_DEPEND1) is missing.$(CLRRST)]
    572693!    endif
    573694!  endif
    … …  
    575696!endif
    576697
    577 
    578 #
    579 # Force rule.
    580 #
    581 .force:
    582     @$(ECHO) .
    583 
     698!ifdef BUILD_DEPEND2
     699! if [$(TOOL_EXISTS) $(BUILD_DEPEND2)] == 0
     700!  ifndef BUILD_QUIET
     701!   if [$(ECHO) Including dependency $(CLRFIL)$(BUILD_DEPEND2)$(CLRRST)]
     702!   endif
     703!  endif
     704!  include $(BUILD_DEPEND2)
     705! else
     706!  ifndef NODEP
     707!    if [$(ECHO) $(CLRERR)WARNING: Please make dependencies first. $(BUILD_DEPEND2) is missing.$(CLRRST)]
     708!    endif
     709!  endif
     710! endif
     711!endif
     712
     713
     714!ifdef BUILD_DEPEND3
     715! if [$(TOOL_EXISTS) $(BUILD_DEPEND3)] == 0
     716!  ifndef BUILD_QUIET
     717!   if [$(ECHO) Including dependency $(CLRFIL)$(BUILD_DEPEND3)$(CLRRST)]
     718!   endif
     719!  endif
     720!  include $(BUILD_DEPEND3)
     721! else
     722!  ifndef NODEP
     723!    if [$(ECHO) $(CLRERR)WARNING: Please make dependencies first. $(BUILD_DEPEND3) is missing.$(CLRRST)]
     724!    endif
     725!  endif
     726! endif
     727!endif
     728
     729
     730!endif
     731

  • trunk/make/setup.mak

    r8213 r8253  
    1 # $Id: setup.mak,v 1.2 2002-04-07 22:43:25 bird Exp $
    2 
    3 #
    4 # Unix-like tools for OS/2
     1# $Id: setup.mak,v 1.3 2002-04-13 04:39:59 bird Exp $
     2
     3#
     4# Generic makefile system.
    55#
    66#   Setting up the build environment variables
    77#
     8#   Many of the variables are a subject to change from project to project.
    89#
    910
    … …  
    1314
    1415
    15 
    16 # -----------
     16# -----------------------------------------------------------------------------
     17# Validate the build the requested environment setup.
     18# -----------------------------------------------------------------------------
     19
     20SHT_TRGPLTFRM=
     21!if "$(BUILD_PLATFORM)" == "OS2"
     22SHT_TRGPLTFRM=os2
     23!endif
     24!if "$(BUILD_PLATFORM)" == "WIN32"
     25SHT_TRGPLTFRM=win32
     26!endif
     27!if "$(SHT_TRGPLTFRM)" == ""
     28! error Fatal error: Env.var BUILD_PLATFORM is either unspecified or incorrect. ($(BUILD_PLATFORM)) Valid values: OS2 and WIN32
     29!endif
     30
     31
     32SHT_BLDMD=
     33!if "$(BUILD_MODE)" == "RELEASE"
     34SHT_BLDMD=rel
     35!endif
     36!if "$(BUILD_MODE)" == "DEBUG"
     37SHT_BLDMD=deb
     38!endif
     39!if "$(BUILD_MODE)" == "PROFILE"
     40SHT_BLDMD=prf
     41!endif
     42!if "$(SHT_BLDMD)" == ""
     43! error Fatal error: Env.var BUILD_MODE is either unspecified or incorrect. ($(BUILD_MODE)) Valid values: RELEASE, DEBUG and PROFILE
     44!endif
     45
     46
     47SHT_BLDENV=
     48!if "$(BUILD_ENV)" == "VAC308"
     49SHT_BLDENV=vac308
     50!endif
     51!if "$(BUILD_ENV)" == "VAC365"
     52SHT_BLDENV=vac365
     53!endif
     54!if "$(BUILD_ENV)" == "VAC4"
     55SHT_BLDENV=vac4
     56!endif
     57!if "$(BUILD_ENV)" == "EMX"
     58SHT_BLDENV=emx
     59!endif
     60!if "$(BUILD_ENV)" == "MSCV6"
     61SHT_BLDENV=mscv6
     62!endif
     63!if "$(BUILD_ENV)" == "WAT11"
     64SHT_BLDENV=wat11
     65!endif
     66!if "$(BUILD_ENV)" == "WATCOM"
     67SHT_BLDENV=wat11
     68!endif
     69!if "$(SHT_BLDENV)" == ""
     70! error Fatal error: Env.var BUILD_ENV is either unspecified or incorrect. ($(BUILD_MODE)) Valid values: VAC308, VAC365, VAC4, EMX, MSCV6 and WATCOM
     71!endif
     72
     73
     74
     75# -----------------------------------------------------------------------------
    1776# Directories
    18 # -----------
    19 
    20 # Note: external makefiles are supposed to set the
    21 # correct *RELATIVE* path to the projects root.
    22 # PATH_ROOT= .., ..\.., whatever
    23 !ifndef PATH_ROOT
    24 !error fatal error: PATH_ROOT undefined.
    25 !endif
    26 
    27 PATH_CURRENT=$(MAKEDIR)
    28 PATH_MAKE=$(PATH_ROOT)\make
    29 PATH_TOOLS=$(PATH_ROOT)\tools\bin
    30 PATH_INCLUDE=$(PATH_ROOT)\include;$(PATH_ROOT)\include\win
    31 PATH_BIN=$(PATH_ROOT)\bin\$(BUILD_MODE)
    32 PATH_LIB=$(PATH_ROOT)\lib\$(BUILD_MODE)
    33 PATH_DLL=$(PATH_ROOT)\bin\$(BUILD_MODE)
    34 PATH_SYS=$(PATH_ROOT)\bin\$(BUILD_MODE)
    35 PATH_DOC=$(PATH_ROOT)\bin\$(BUILD_MODE)
    36 
    37 BUILD_TIMESTAMP=$(TIMESTAMP)
    38 
    39 
    40 # -----------------------------------------------------------------------
    41 # Common variables
    42 # We provide some variables that can be overridden by the specific setups
    43 # -----------------------------------------------------------------------
    44 
    45 TOOL_MAKE=$(MAKE) -nologo
    46 
    47 
    48 # ----------------------
     77# -----------------------------------------------------------------------------
     78
     79# current directory.
     80PATH_CURRENT    = $(MAKEDIR)
     81# Where build system files are located. (like this file)
     82PATH_MAKE       = $(PATH_ROOT)\make
     83# Where the bulid system and other tools are located
     84PATH_TOOLS      = $(PATH_ROOT)\tools\bin
     85# Where platform-specific files are located. (like the .def files)
     86# (default) PATH_DEF        = $(SHT_TRGPLTFRM)
     87PATH_DEF        = .
     88# Where the include files are located.
     89PATH_INCLUDES   = $(PATH_ROOT)\include;$(PATH_ROOT)\include\win
     90
     91# Where the temporary files goes.
     92PATH_OBJ    = $(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENV)
     93# Where the executable binaries goes.
     94PATH_BIN    = $(PATH_ROOT)\bin\$(BUILD_MODE)
     95# Where the public libraries goes.
     96PATH_LIB    = $(PATH_ROOT)\lib\$(BUILD_MODE)
     97# Where the dynamic link libraries goes.
     98PATH_DLL    = $(PATH_ROOT)\bin\$(BUILD_MODE)
     99# Where the drivers goes. (common for IFS and SYS.)
     100PATH_SYS    = $(PATH_ROOT)\bin\$(BUILD_MODE)
     101# Where the documentation goes.
     102PATH_DOC    = $(PATH_ROOT)\bin\$(BUILD_MODE)
     103# Where the helpfiles goes.
     104PATH_HLP    = $(PATH_ROOT)\bin\$(BUILD_MODE)
     105
     106
     107# Note: Makefiles are supposed to set the correct *RELATIVE* path to the
     108#       projects root. Using '\' slashes please. No trailing slash.
     109#
     110# Example:
     111#       PATH_ROOT= ..\..\..
     112# Assert PATH_ROOT
     113!if "$(PATH_ROOT)" == ""
     114!error fatal error: PATH_ROOT empty or undefined.
     115!endif
     116
     117
     118# -----------------------------------------------------------------------------
     119# Common variables / Project variables
     120# -----------------------------------------------------------------------------
     121
     122# The default definitions.
     123BUILD_DEFINES = -D__WIN32OS2__ -D__WINE__ -D__i386__
     124
     125# This is the process file to include at end of the makefile.
     126MAKE_INCLUDE_PROCESS    = $(PATH_MAKE)\process.mak
     127
     128
     129
     130# -----------------------------------------------------------------------------
    49131# Build the environments
    50 # ----------------------
    51 
    52 # BUILD_PLATFORM: OS2, WIN32, ...
    53 # BUILD_ENV: VAC308, VAC365, VAC4, EMX, MSC6, WATCOM
    54 # BUILD_MODE: RELEASE, PROFILE, DEBUG
    55 
    56 !ifndef BUILD_PLATFORM
    57 !error Please set BUILD_PLATFORM to OS2, WIN32, ...
    58 !endif
    59 
    60 !ifndef BUILD_MODE
    61 !error Please set BUILD_MODE to RELEASE, PROFILE, or DEBUG
    62 !endif
    63 
    64 !ifndef BUILD_ENV
    65 !error Please set BUILD_ENV to VAC308, VAC365, VAC4, EMX, MSVC6, ...
    66 !endif
    67 
    68 
    69 # ----------------------
    70 # Build the environments
    71 # ----------------------
    72 
    73 # Build the appropriate setup.xxx name from the BUILD environment variables.
    74 
    75 !if "$(BUILD_PLATFORM)" == "OS2"
    76 NAME_1=os2
    77 !endif
    78 !if "$(BUILD_PLATFORM)" == "WIN32"
    79 NAME_1=win32
    80 !endif
    81 !if "$(NAME_1)" == ""
    82 ! error The current setting of BUILD_PLATFORM is unknown or incorrect ($(BUILD_PLATFORM)) (1)
    83 !endif
    84 
    85 
    86 !if "$(BUILD_MODE)" == "RELEASE"
    87 NAME_2=rel
    88 !endif
    89 !if "$(BUILD_MODE)" == "DEBUG"
    90 NAME_2=deb
    91 !endif
    92 !if "$(BUILD_MODE)" == "PROFILE"
    93 NAME_2=prf
    94 !endif
    95 !if "$(NAME_2)" == ""
    96 ! error The current setting of BUILD_MODE is unknown or incorrect ($(BUILD_MODE)) (2)
    97 !endif
    98 
    99 
    100 !if "$(BUILD_ENV)" == "VAC308"
    101 NAME_3=vac308
    102 !endif
    103 !if "$(BUILD_ENV)" == "VAC365"
    104 NAME_3=vac365
    105 !endif
    106 !if "$(BUILD_ENV)" == "VAC4"
    107 NAME_3=vac4
    108 !endif
    109 !if "$(BUILD_ENV)" == "EMX"
    110 NAME_3=emx
    111 !endif
    112 !if "$(BUILD_ENV)" == "MSCV6"
    113 NAME_3=mscv6
    114 !endif
    115 !if "$(BUILD_ENV)" == "WATCOM"
    116 NAME_3=wat11
    117 !endif
    118 !if "$(NAME_3)" == ""
    119 ! error The current setting of BUILD_ENV is unknown or incorrect ($(BUILD_ENV)) (3)
    120 !endif
    121 
    122 
    123 # build name from the fragments
    124 !include <$(PATH_MAKE)\setup.tools.mk>
    125 MAKE_INCLUDE_SETUP=$(PATH_MAKE)\setup.$(NAME_1)$(NAME_2)$(NAME_3).mk
    126 !if [$(ECHO) Including platform setup file $(CLRFIL)"$(MAKE_INCLUDE_SETUP)"$(CLRRST)]
    127 !endif
    128 !include <$(MAKE_INCLUDE_SETUP)>
    129 
    130 # set the path name for platform-specific generated files.
    131 PATH_OBJ=$(PATH_ROOT)\obj\$(NAME_1)$(NAME_2)$(NAME_3)
    132 
    133 # set the path name for platform-specific definitino files.
    134 PATH_DEF=
    135 
    136 # ensure this path exists
     132# -----------------------------------------------------------------------------
     133
     134# EXPERIMENTAL
     135!if 0
     136# These strings are passed on to the BuildEnv.cmd script to setup
     137# the correct environment.
     138BUILD_ENVS_BASE_POST    = toolkit40
     139BUILD_ENVS_BASE_PRE     =
     140
     141# Check for forced change in default compiler environment.
     142!ifdef BUILD_ENV_FORCE
     143!if "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)" || "$(BUILD_ENVS_PRE)" != "" || "$(BUILD_ENVS_POST)" != ""
     144#
     145# Remove old compiler and insert new compiler into the environment.
     146# The individual makefiles requests changes using BUILD_ENVS_[PRE|POST].
     147#
     148!if [echo call $(PATH_TOOLS)\BuildEnv.cmd $(BUILD_ENV)- $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(BUILD_ENV_FORCE) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)]
     149!endif
     150!if [call $(PATH_TOOLS)\BuildEnv.cmd $(BUILD_ENV)- $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(BUILD_ENV_FORCE) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)]
     151!endif
     152#BUILD_ENV = $(BUILD_ENV_FORCE)
     153!endif
     154!endif
     155
     156!endif
     157
     158
     159
     160# -----------------------------------------------------------------------------
     161# Include the setup.
     162#   First the default common tools setup is included.
     163#   The the environment specific setup.
     164# -----------------------------------------------------------------------------
     165
     166!include $(PATH_MAKE)\setup.tools.mk
     167
     168MAKE_INCLUDE_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENV).mk
     169!ifndef BUILD_QUIET
     170! if [$(ECHO) Including platform setup file $(CLRFIL)"$(MAKE_INCLUDE_SETUP)"$(CLRRST)]
     171! endif
     172!endif
     173!include $(MAKE_INCLUDE_SETUP)
     174
     175
     176# -----------------------------------------------------------------------------
     177# Verify the environment setups.
     178# -----------------------------------------------------------------------------
     179
     180!ifndef ENV_NAME
     181!error No environment signature has been defined ($(NAME_COMPLETE))
     182!endif
     183
     184!ifndef MAKE_INCLUDE_SETUP
     185!error No setup to include has been determined (MAKE_INCLUDE_SETUP)
     186!endif
     187
     188!if "$(ENV_STATUS)" != "OK"
     189!error Environment $(ENV_NAME) does work yet (ENV_STATUS is not OK).
     190!endif
     191
     192!ifndef CC
     193!error Environment $(ENV_NAME) does not define variable (CC).
     194!endif
     195
     196!ifndef CC_FLAGS_EXE
     197!error Environment $(ENV_NAME) does not define variable (CC_FLAGS_EXE).
     198!endif
     199
     200!ifndef LINK
     201!error Environment $(ENV_NAME) does not define variable (LINK).
     202!endif
     203
     204!ifndef LINK_FLAGS_EXE
     205!error Environment $(ENV_NAME) does not define variable (LINK_FLAGS_EXE).
     206!endif
     207
     208
     209# -----------------------------------------------------------------------------
     210# Ensure the output path exists
     211# -----------------------------------------------------------------------------
    137212!if "$(PATH_OBJ)" != ""
    138213! if [$(TOOL_EXISTS) $(PATH_OBJ)] != 0
    139 !  if [$(ECHO) Target path $(PATH_OBJ) does NOT exist. Creating. $(CLRRST)]
     214!  ifndef BUILD_QUIET
     215!   if [$(ECHO) Target path $(PATH_OBJ) does NOT exist. Creating. $(CLRRST)]
     216!   endif
    140217!  endif
    141218!  if [$(TOOL_CREATEPATH) $(PATH_OBJ)]
    142 !   error Could not create $(PATH_OBJ)
     219!   error Fatal error: Could not create $(PATH_OBJ).
    143220!  endif
    144221! endif
    … …  
    146223
    147224
    148 # -----------------------
    149 # Verify the environments
    150 # Note: "foreach" is not used to provide compatibility with older NMAKEs.
    151 # -----------------------
    152 
    153 !ifndef ENV_NAME
    154 !error No environment signature has been defined ($(NAME_COMPLETE))
    155 !endif
    156 
    157 !ifndef MAKE_INCLUDE_SETUP
    158 !error No setup to include has been determined (MAKE_INCLUDE_SETUP)
    159 !endif
    160 
    161 !if "$(ENV_STATUS)" != "OK"
    162 !error Environment $(ENV_NAME) does work yet (ENV_STATUS is not OK).
    163 !endif
    164 
    165 !ifndef CC
    166 !error Environment $(ENV_NAME) does not define variable (CC).
    167 !endif
    168 
    169 !ifndef CD
    170 !error Environment $(ENV_NAME) does not define variable (CD).
    171 !endif
    172 
    173 !ifndef CC_FLAGS_EXE
    174 !error Environment $(ENV_NAME) does not define variable (CC_FLAGS_EXE).
    175 !endif
    176 
    177 !ifndef LINK
    178 !error Environment $(ENV_NAME) does not define variable (LINK).
    179 !endif
    180 
    181 !ifndef LINK_FLAGS_EXE
    182 !error Environment $(ENV_NAME) does not define variable (LINK_FLAGS_EXE).
    183 !endif
    184 
    185 
    186 # -----------------------------------------
    187 # Now we setup some final, common variables
    188 # -----------------------------------------
    189 MAKE_INCLUDE_PROCESS=$(PATH_MAKE)\process.mak
    190 
    191 
    192225!endif MAKE_SETUP_INCLUDED
     226

  • trunk/make/setup.os2debalp.mk

    r8214 r8253  
    1 # $Id: setup.os2debalp.mk,v 1.1 2002-04-07 22:43:54 bird Exp $
     1# $Id: setup.os2debalp.mk,v 1.2 2002-04-13 04:39:59 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_INCLUDE)
     11AS_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:)
    1212AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
    1313AS_OBJ_OUT  = -Fo:

  • trunk/make/setup.os2debmscv6.mk

    r8213 r8253  
    1 # $Id: setup.os2debmscv6.mk,v 1.2 2002-04-07 22:43:25 bird Exp $
     1# $Id: setup.os2debmscv6.mk,v 1.3 2002-04-13 04:39:59 bird Exp $
    22
    33# ---OS2, DEBUG, MSCV6-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=-DDEBUG -DOS2 -c -W0 -Asfw $(CC_SEGS) -G2s -Zp -Zl -nologo -Zi -Owis $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) -I$(PATH_INCLUDE)
     34CC_FLAGS=-DDEBUG -DOS2 -c -W0 -Asfw $(CC_SEGS) -G2s -Zp -Zl -nologo -Zi -Owis $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) -I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS) /Lp
    3636CC_FLAGS_DLL=$(CC_FLAGS)
    … …  
    6969LINK_LNK5=$(TARGET_DEF)
    7070
    71 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     71RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    7272RL_FLAGS=-x2 -n
    7373

  • trunk/make/setup.os2debvac308.mk

    r8213 r8253  
    1 # $Id: setup.os2debvac308.mk,v 1.2 2002-04-07 22:43:26 bird Exp $
     1# $Id: setup.os2debvac308.mk,v 1.3 2002-04-13 04:39:59 bird Exp $
    22
    33# ---OS2, DEBUG, VAC308-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     34CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS) /Gm+ /Ge+ /Gn+
    3636CC_FLAGS_DLL=$(CC_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    4242CC_PC_2_STDOUT=/Pd+ /P+
    4343
    44 CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CXX_SEGS)  $(CXX_DEFINES) $(ALL_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     44CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CXX_SEGS)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    4545CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+ /Gn+
    4646CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    8181!endif
    8282
    83 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     83RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    8484RL_FLAGS=-x2 -n
    8585

  • trunk/make/setup.os2debvac365.mk

    r8213 r8253  
    1 # $Id: setup.os2debvac365.mk,v 1.2 2002-04-07 22:43:26 bird Exp $
     1# $Id: setup.os2debvac365.mk,v 1.3 2002-04-13 04:40:00 bird Exp $
    22
    33# ---OS2, DEBUG, VAC365-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     34CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS) /Gm+ /Ge+ /Gn+
    3636CC_FLAGS_DLL=$(CC_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    4242CC_PC_2_STDOUT=/Pd+ /P+
    4343
    44 CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     44CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    4545CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+ /Gn+
    4646CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    8181!endif
    8282
    83 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     83RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    8484RL_FLAGS=-x2 -n
    8585

  • trunk/make/setup.os2prfalp.mk

    r8214 r8253  
    1 # $Id: setup.os2prfalp.mk,v 1.1 2002-04-07 22:43:54 bird Exp $
     1# $Id: setup.os2prfalp.mk,v 1.2 2002-04-13 04:40: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_INCLUDE)
     11AS_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:)
    1212AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
    1313AS_OBJ_OUT  = -Fo:

  • trunk/make/setup.os2prfvac308.mk

    r8213 r8253  
    1 # $Id: setup.os2prfvac308.mk,v 1.2 2002-04-07 22:43:26 bird Exp $
     1# $Id: setup.os2prfvac308.mk,v 1.3 2002-04-13 04:40:00 bird Exp $
    22
    33# ---OS2, PROFILE, VAC308-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     34CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS) /Gm+ /Ge+ /Gn+
    3636CC_FLAGS_DLL=$(CC_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    4242CC_PC_2_STDOUT=/Pd+ /P+
    4343
    44 CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     44CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    4545CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+ /Gn+
    4646CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    8181!endif
    8282
    83 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     83RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    8484RL_FLAGS=-x2 -n
    8585

  • trunk/make/setup.os2prfvac365.mk

    r8213 r8253  
    1 # $Id: setup.os2prfvac365.mk,v 1.2 2002-04-07 22:43:26 bird Exp $
     1# $Id: setup.os2prfvac365.mk,v 1.3 2002-04-13 04:40:00 bird Exp $
    22
    33# ---OS2, PROFILE, VAC365-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     34CC_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS) /Gm+ /Ge+ /Gn+
    3636CC_FLAGS_DLL=$(CC_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    4242CC_PC_2_STDOUT=/Pd+ /P+
    4343
    44 CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     44CXX_FLAGS=/Q /DDEBUG /DOS2 /Ti+ /O- /Gh+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    4545CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+ /Gn+
    4646CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    8181!endif
    8282
    83 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     83RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    8484RL_FLAGS=-x2 -n
    8585

  • trunk/make/setup.os2relalp.mk

    r8214 r8253  
    1 # $Id: setup.os2relalp.mk,v 1.1 2002-04-07 22:43:54 bird Exp $
     1# $Id: setup.os2relalp.mk,v 1.2 2002-04-13 04:40: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_INCLUDE)
     11AS_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:)
    1212AS_FLAGS_SYS= $(AS_FLAGS) -D:RING0 -i:$(PATH_DDK)\base\inc
    1313AS_OBJ_OUT= -Fo:

  • trunk/make/setup.os2relmscv6.mk

    r8213 r8253  
    1 # $Id: setup.os2relmscv6.mk,v 1.2 2002-04-07 22:43:26 bird Exp $
     1# $Id: setup.os2relmscv6.mk,v 1.3 2002-04-13 04:40:00 bird Exp $
    22
    33# ---OS2, RELEASE, MSCV6-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=-DDEBUG -DOS2 -c -W0 -Asfw $(CC_SEGS) -G2s -Zp -Zl -nologo -Ogeitln -Gs $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) -I$(PATH_INCLUDE)
     34CC_FLAGS=-DDEBUG -DOS2 -c -W0 -Asfw $(CC_SEGS) -G2s -Zp -Zl -nologo -Ogeitln -Gs $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) -I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS)
    3636CC_FLAGS_DLL=$(CC_FLAGS)
    … …  
    6969LINK_LNK5=$(TARGET_DEF)
    7070
    71 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     71RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    7272RL_FLAGS=-x2 -n
    7373

  • trunk/make/setup.os2relvac308.mk

    r8213 r8253  
    1 # $Id: setup.os2relvac308.mk,v 1.2 2002-04-07 22:43:26 bird Exp $
     1# $Id: setup.os2relvac308.mk,v 1.3 2002-04-13 04:40:00 bird Exp $
    22
    33# ---OS2, RELEASE, VAC308-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     34CC_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS) /Gm+ /Ge+ /Gn+
    3636CC_FLAGS_DLL=$(CC_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    4242CC_PC_2_STDOUT=/Pd+ /P+
    4343
    44 CXX_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     44CXX_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    4545CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+ /Gn+
    4646CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    8181!endif
    8282
    83 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     83RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    8484RL_FLAGS=-x2 -n
    8585

  • trunk/make/setup.os2relvac365.mk

    r8213 r8253  
    1 # $Id: setup.os2relvac365.mk,v 1.2 2002-04-07 22:43:27 bird Exp $
     1# $Id: setup.os2relvac365.mk,v 1.3 2002-04-13 04:40:01 bird Exp $
    22
    33# ---OS2, RELEASE, VAC365-------------------------
    … …  
    3232AR_LNK2= $(@R).lst
    3333
    34 CC_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /qtune=pentium2 /Gf+ /Gi+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     34CC_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /qtune=pentium2 /Gf+ /Gi+ /Ss+ /C+ $(CC_SEGS) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    3535CC_FLAGS_EXE=$(CC_FLAGS) /Gm+ /Ge+ /Gn+
    3636CC_FLAGS_DLL=$(CC_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    4242CC_PC_2_STDOUT=/Pd+ /P+
    4343
    44 CXX_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDE)
     44CXX_FLAGS=/Q /DOS2 /Ti+ /O+ /G5 /Gf+ /Gi+ /Ss+ /C+ $(CXX_SEGS) $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
    4545CXX_FLAGS_EXE=$(CXX_FLAGS) /Gm+ /Ge+ /Gn+
    4646CXX_FLAGS_DLL=$(CXX_FLAGS) /Gm+ /Ge- /Gn-
    … …  
    8181!endif
    8282
    83 RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
     83RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
    8484RL_FLAGS=-x2 -n
    8585

  • trunk/make/setup.tools.mk

    r8213 r8253  
    1 # $Id: setup.tools.mk,v 1.2 2002-04-07 22:43:27 bird Exp $
     1# $Id: setup.tools.mk,v 1.3 2002-04-13 04:40:01 bird Exp $
    22
    33#
    … …  
    1010TOOL_MAKE=$(MAKE) -nologo
    1111TOOL_DEP=$(PATH_TOOLS)\fastdep.exe
    12 TOOL_DEP_FLAGS=-i $(PATH_INCLUDE) $(CC_INCLUDES) $(CXX_INCLUDES) $(AS_INCLUDES) $(ALL_INCLUDES)
    13 TOOL_DEP_FILES=*.c *.cpp *.asm *.h *.rc *.dlg
     12TOOL_DEP_FLAGS=$(CC_INCLUDES) $(CXX_INCLUDES) $(AS_INCLUDES) $(ALL_INCLUDES) -i$(PATH_INCLUDES:;= -i)
     13TOOL_DEP_FILES=*.c *.cpp *.asm *.h *.rc *.dlg *.orc *.inc *.ipf
    1414TOOL_CREATEPATH=$(PATH_TOOLS)\CreatePath.cmd
    1515TOOL_EXISTS=$(PATH_TOOLS)\Exists.cmd
    … …  
    4646#
    4747# Default Extensions.
    48 # 
     48#
    4949EXT_OBJ = obj
    5050EXT_LIB = lib
Note: See TracChangeset for help on using the changeset viewer.