Changeset 719 for trunk/dll

Timestamp:

Jul 4, 2007, 2:54:53 AM (18 years ago)

Author:

Steven Levine

Message:

Change DEBUG semantics to ifdef/ifndef

Location:

trunk/dll

Files:

• internal/makefile (modified) (2 diffs)
• makefile (modified) (5 diffs)

trunk/dll/internal/makefile

@@ -31 +31 @@
 CFLAGS = -bt=os2 -mf -bm -d2 -olirs -s -j -wx -zfp -zgp -zq -hd
 
-# fixme
-#LFLAGS = /EXEPACK:2 /MAP /PMTYPE:VIO
-
 all: $(BASE).exe .symbolic
 
@@ -48 +45 @@
    @%write $^@ option cache
    @%write $^@ option caseexact
-!if $(DEBUG)
+!ifdef DEBUG
     @%write $^@ debug dwarf all
 !endif

trunk/dll/makefile

@@ -25 +25 @@
 # 12 May 07 SHL Drop obsolete macros
 # 02 Jun 07 SHL Convert to OpenWatcom
-
-# Warning - may still be missing some *.h dependencies
+# 27 Jun 07 SHL Allow DEBUG set from command line or environment
+# 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
 
 # Environment:
 
-#   DEBUG       0 = release build, 1 = debug build
-#   WARN        define for verbose compile time warnings
+#   DEBUG - not defined = release build, defined = debug build
 
 BASE = fm3dll
@@ -44 +43 @@
 # fixme for wrc to build working .res
 # fixme for wrc to not clobber bldlevel strings
+
+!ifndef USE_WRC
 USE_WRC = 0
+!endif
 
 !if $(USE_WRC)
@@ -50 +52 @@
 !else
 RC = rc
+!endif
+
+# Keep this code in sync with makefile_pre.mk
+!ifndef DEBUG                  # if not defined on wmake command line
+!ifdef %DEBUG                  # if defined in environment
+DEBUG = $(%DEBUG)              # use environment setting
+!endif
 !endif
 
@@ -75 +84 @@
 # -zq           quiet
 
-!ifdef %DEBUG
+!ifdef DEBUG
 CFLAGS =   -bt=os2 -mf -bd -bm -d2 -olirs   -s -sg -j -wx -zfp -zgp -zq -hd
 !else
@@ -84 +93 @@
 CFLAGSR = -bt=os2 -mf -bd -bm     -olirs   -s -j -wx -zfp -zgp
 
-!ifdef %DEBUG
+!ifdef DEBUG
 LFLAGS = sys os2v2_dll initinstance terminstance op quiet op verbose op cache &
          op caseexact op implib op map debug dwarf all