Changeset 833

Timestamp:

Sep 5, 2007, 7:48:31 PM (18 years ago)

Author:

Steven Levine

Message:

Update fm3dll.rc for OpenWatcom wrc compat
Correct dll\makefile USE_WRC logic

Location:

trunk/dll

Files:

• fm3res.rc (modified) (2 diffs)
• makefile (modified) (2 diffs)

trunk/dll/fm3res.rc

@@ -27 +27 @@
   06 Aug 07 GKY Fix Dirsizes accel key to be ctrl + z
   30 Aug 07 SHL Add accelerator support to QuickList windows
+  05 Sep 07 SHL Small change for OpenWatcom wrc compat
 
 ***********************************************************************/
@@ -272 +273 @@
     MENUITEM "~Contents\tF1",        IDM_HELPCONTENTS
     MENUITEM "~General help",               IDM_HELPGENERAL
-    MENUITEM "~Keys help\tCtrl + k"       IDM_HELPKEYS
+    MENUITEM "~Keys help\tCtrl + k",       IDM_HELPKEYS
     MENUITEM "~Mouse help",                 IDM_HELPMOUSE
     MENUITEM "~Tutorials",                  IDM_HELPTUTOR

trunk/dll/makefile

@@ -31 +31 @@
 # 06 Aug 07 SHL Tweak CFLAGS for DEBUG builds
 # 26 Aug 07 SHL Clean *.lrf
+# 05 Sep 07 SHL Correct USE_WRC logic
 
 # Environment:
@@ -45 +46 @@
 LINK = wlink
 
-# fixme for wrc to build working .res
-# fixme for wrc to not clobber bldlevel strings
-
-!ifndef USE_WRC
+# fixme for wrc to build working .res 
+# fixme ow 1.6 wrc clobbers bldlevel strings
+
+!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