Changeset 903 for trunk

Timestamp:

Jan 5, 2008, 3:51:36 AM (18 years ago)

Author:

Steven Levine

Message:

Switch to wrc.exe as default resource compiler.
Support USE_RC wmake variable to override.

Location:

trunk

Files:

• dll/makefile (modified) (5 diffs)
• makefile_pre.mk (modified) (3 diffs)

trunk/dll/makefile

@@ -34 +34 @@
 # 22 Sep 07 SHL Switch to 4 byte packing (-zp4)
 # 03 Jan 08 SHL Prepare for final, implending switch to wrc.exe
+# 03 Jan 08 SHL Switch to wrc.exe default; support USE_RC from environment
 
 # Environment:
@@ -48 +49 @@
 LINK = wlink
 
-# // 01 Jan 08 SHL fixme debug
-# USE_WRC = 1
-
-!ifndef USE_WRC                 # if not defined on command line
-!ifdef %USE_WRC                 # if defined in environment
-USE_WRC = $(%USE_WRC)
-!else
-USE_WRC = 0
-!endif
-!endif
-
-!if $(USE_WRC)
+!ifndef USE_RC                  # if not defined on command line
+!ifdef %USE_RC                  # if defined in environment
+USE_RC = $(%USE_RC)
+!else
+USE_RC = 0
+!endif
+!endif
+
+!if $(USE_RC)
+RC = rc
+!else
 RC = wrc
-!else
-RC = rc
 !endif
 
@@ -119 +117 @@
 
 # rc Includes can be in current director or dll subdirectory
-!if $(USE_WRC)
+!if $(USE_RC)
+RCFLAGS = -r -i dll
+RCFLAGS2 = -x2
+!else
 # Pass 1 flags
 RCFLAGS = -r -i=dll -ad
 # Pass 2 flags
 RCFLAGS2 =
-!else
-RCFLAGS = -r -i dll
-RCFLAGS2 = -x2
 !endif
 
@@ -213 +211 @@
 $(BASERES).res: *.rc *.dlg fm3dll2.h fm3dlg.h $(ICONS)
   $(RC) $(RCFLAGS) $*
-!if ! $(USE_WRC)
+!if $(USE_RC)
   ren $*.res $*.res
 !endif
@@ -242 +240 @@
   bldlevel $@
 
-!endif
+!endif # MAKERES mode
+
+# For testing new code
+tmp.obj: tmp.c
 
 $(BASERES).str: $(BASE).str fm3str.h version.h

trunk/makefile_pre.mk

@@ -10 +10 @@
 # 22 Sep 07 SHL Switch to 4 byte packing (-zp4)
 # 26 Sep 07 SHL Support USE_WRC from environment
+# 03 Jan 08 SHL Switch to wrc.exe default; support USE_RC from environment
 
 CC = wcc386
 LINK = wlink
 
-# 26 Sep 07 SHL fixme for rc.exe logic to be gone
-
-!ifndef USE_WRC                 # if not defined on command line
-!ifdef %USE_WRC                 # if defined in environment
-USE_WRC = $(%USE_WRC)
+!ifndef USE_RC                  # if not defined on command line
+!ifdef %USE_RC                  # if defined in environment
+USE_RC = $(%USE_RC)
 !else
-USE_WRC = 0
+USE_RC = 0
 !endif
 !endif
 
-!if $(USE_WRC)
+!if $(USE_RC)
+RC = rc
+!else
 RC = wrc
-!else
-RC = rc
 !endif
 
@@ -72 +71 @@
 
 # rc Includes can be in current director or dll subdirectory
-!if $(USE_WRC)
+!if $(USE_RC)
+RCFLAGS = -r -i dll
+RCFLAGS2 = -x2
+!else
 # Pass 1 flags
 RCFLAGS = -r -i=dll -ad
 # Pass 2 flags
 RCFLAGS2 =-ad
-!else
-RCFLAGS = -r -i dll
-RCFLAGS2 = -x2
 !endif
 
@@ -85 +84 @@
 .SUFFIXES: .obj .c .res .rc .ipf
 
-!if $(USE_WRC)
-.rc.res: .AUTODEPEND
-  $(RC) $(RCFLAGS) $*.rc
-!else
+!if $(USE_RC)
 .rc.res:
    $(RC) $(RCFLAGS) $*.rc
    ren $*.res $*.res
+!else
+.rc.res: .AUTODEPEND
+  $(RC) $(RCFLAGS) $*.rc
 !endif