Changeset 719


Ignore:
Timestamp:
Jul 4, 2007, 2:54:53 AM (18 years ago)
Author:
Steven Levine
Message:

Change DEBUG semantics to ifdef/ifndef

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/internal/makefile

    r716 r719  
    3131CFLAGS = -bt=os2 -mf -bm -d2 -olirs -s -j -wx -zfp -zgp -zq -hd
    3232
    33 # fixme
    34 #LFLAGS = /EXEPACK:2 /MAP /PMTYPE:VIO
    35 
    3633all: $(BASE).exe .symbolic
    3734
    … …  
    4845   @%write $^@ option cache
    4946   @%write $^@ option caseexact
    50 !if $(DEBUG)
     47!ifdef DEBUG
    5148    @%write $^@ debug dwarf all
    5249!endif

  • trunk/dll/makefile

    r706 r719  
    2525# 12 May 07 SHL Drop obsolete macros
    2626# 02 Jun 07 SHL Convert to OpenWatcom
    27 
    28 # Warning - may still be missing some *.h dependencies
     27# 27 Jun 07 SHL Allow DEBUG set from command line or environment
     28# 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
    2929
    3030# Environment:
    3131
    32 #   DEBUG       0 = release build, 1 = debug build
    33 #   WARN        define for verbose compile time warnings
     32#   DEBUG - not defined = release build, defined = debug build
    3433
    3534BASE = fm3dll
    … …  
    4443# fixme for wrc to build working .res
    4544# fixme for wrc to not clobber bldlevel strings
     45
     46!ifndef USE_WRC
    4647USE_WRC = 0
     48!endif
    4749
    4850!if $(USE_WRC)
    … …  
    5052!else
    5153RC = rc
     54!endif
     55
     56# Keep this code in sync with makefile_pre.mk
     57!ifndef DEBUG                  # if not defined on wmake command line
     58!ifdef %DEBUG                  # if defined in environment
     59DEBUG = $(%DEBUG)              # use environment setting
     60!endif
    5261!endif
    5362
    … …  
    7584# -zq           quiet
    7685
    77 !ifdef %DEBUG
     86!ifdef DEBUG
    7887CFLAGS =   -bt=os2 -mf -bd -bm -d2 -olirs   -s -sg -j -wx -zfp -zgp -zq -hd
    7988!else
    … …  
    8493CFLAGSR = -bt=os2 -mf -bd -bm     -olirs   -s -j -wx -zfp -zgp
    8594
    86 !ifdef %DEBUG
     95!ifdef DEBUG
    8796LFLAGS = sys os2v2_dll initinstance terminstance op quiet op verbose op cache &
    8897         op caseexact op implib op map debug dwarf all

  • trunk/makefile

    r703 r719  
    1717#               differences in how Watcom handles macros.
    1818
    19 # Environment:
    20 
    21 # DEBUG 0 = release build, 1 = debug build
     19# Environment - see makefile_pre.mk
    2220
    2321BASE = fm3
    … …  
    2624# e.g. FM2_VER=-3-5-9 results in FM2-3-5-9.wpi being built
    2725# If FM2_VER is empty, then FM2.wpi is built
    28 # NOTE: Start the variable with '-'
     26# NOTE: Start the value with '-'
    2927
    3028!ifndef FM2_VER                  # if defined on wmake command, use it
    … …  
    3836# e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
    3937# If FM2UTILS_VER is empty, then FM2UTILS.wpi is built
    40 # NOTE: Start the variable with '-'
     38# NOTE: Start the value with '-'
    4139
    4240!ifndef FM2UTILS_VER             # if defined on wmake command, use it
    … …  
    9997# Apply to each *.mak for other exes
    10098lxlite:: *.mak .symbolic
    101 #  !$(MAKE) -f $? $(__MAKEOPTS__) lxlite
    10299   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) lxlite
    103100

  • trunk/makefile_post.mk

    r691 r719  
    1313
    1414$(BASE).exe: $(BASE).lrf $(BASE).obj $(BASE).res $(BASE).def .explicit
    15   @$(LINK) @$(BASE).lrf @$(BASE).def
     15  $(LINK) @$(BASE).lrf @$(BASE).def
    1616  $(RC) $(RCFLAGS2) $(BASE).res $@
    1717  bldlevel $@

  • trunk/makefile_pre.mk

    r714 r719  
    55# 02 Jun 07 SHL Convert to OpenWatcom
    66# 27 Jun 07 SHL Use same CFLAGS for all builds
     7# 27 Jun 07 SHL Allow DEBUG set from command line or environment
     8# 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
    79
    810CC = wcc386
    911LINK = wlink
    1012
    11 # fixme for wrc to build working .res
    12 # fixme for wrc to not clobber bldlevel strings
     13# fixme use use wrc when wrc fixed (v1.7 maybe)
     14# wrc 1.6 is broken - does not copy resident name table
    1315
    1416!ifndef USE_WRC
    … …  
    2022!else
    2123RC = rc
     24!endif
     25
     26# Keep this code in sync with dll\makefile
     27!ifndef DEBUG                  # if not defined on wmake command line
     28!ifdef %DEBUG                  # if defined in environment
     29DEBUG = $(%DEBUG)              # pass environment value
     30!endif
    2231!endif
    2332
    … …  
    4655
    4756# We always compile with debug info to avoid needed a full rebuild just to debug
    48 CFLAGS =   -bt=os2 -mf -bm -d2 -olirs   -s -j -wx -zfp -zgp -zq -hd
     57CFLAGS = -bt=os2 -mf -bm -d2 -olirs   -s -j -wx -zfp -zgp -zq -hd
    4958
    50 !ifdef %DEBUG
    51 LFLAGS = sys os2v2_pm op quiet op verbose op cache op caseexact op map debug dwarf all
    52 !else
    5359LFLAGS = sys os2v2_pm op quiet op verbose op cache op caseexact op map
     60!ifdef DEBUG
     61LFLAGS += debug dwarf all
    5462!endif
    5563
Note: See TracChangeset for help on using the changeset viewer.