Changeset 719 for trunk/makefile_pre.mk

Timestamp:

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

Author:

Steven Levine

Message:

Change DEBUG semantics to ifdef/ifndef

File:

• trunk/makefile_pre.mk (modified) (3 diffs)

trunk/makefile_pre.mk

@@ -5 +5 @@
 # 02 Jun 07 SHL Convert to OpenWatcom
 # 27 Jun 07 SHL Use same CFLAGS for all builds
+# 27 Jun 07 SHL Allow DEBUG set from command line or environment
+# 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
 
 CC = wcc386
 LINK = wlink
 
-# fixme for wrc to build working .res
-# fixme for wrc to not clobber bldlevel strings
+# fixme use use wrc when wrc fixed (v1.7 maybe)
+# wrc 1.6 is broken - does not copy resident name table
 
 !ifndef USE_WRC
@@ -20 +22 @@
 !else
 RC = rc
+!endif
+
+# Keep this code in sync with dll\makefile
+!ifndef DEBUG                  # if not defined on wmake command line
+!ifdef %DEBUG                  # if defined in environment
+DEBUG = $(%DEBUG)              # pass environment value
+!endif
 !endif
 
@@ -46 +55 @@
 
 # We always compile with debug info to avoid needed a full rebuild just to debug
-CFLAGS =   -bt=os2 -mf -bm -d2 -olirs   -s -j -wx -zfp -zgp -zq -hd
+CFLAGS = -bt=os2 -mf -bm -d2 -olirs   -s -j -wx -zfp -zgp -zq -hd
 
-!ifdef %DEBUG
-LFLAGS = sys os2v2_pm op quiet op verbose op cache op caseexact op map debug dwarf all
-!else
 LFLAGS = sys os2v2_pm op quiet op verbose op cache op caseexact op map
+!ifdef DEBUG
+LFLAGS += debug dwarf all
 !endif