From ed7f503db60d58d2b3b2f56bcc91f3f059e84540 Mon Sep 17 00:00:00 2001
From: Pekka Pirinen <pekka@harlequin.com>
Date: Mon, 29 Dec 1997 17:42:04 +0000
Subject: [PATCH] Fix the parameter test; only use /oy- for dylan

Copied from Perforce
 Change: 19142
 ServerID: perforce.ravenbrook.com
---
 mps/src/commpre.nmk | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/mps/src/commpre.nmk b/mps/src/commpre.nmk
index 3da7c91f784..282e12932b7 100644
--- a/mps/src/commpre.nmk
+++ b/mps/src/commpre.nmk
@@ -1,6 +1,6 @@
 # ==== FIRST COMMON FRAGMENT FOR PLATFORMS USING MV AND NMAKE
 #
-# $HopeName: MMsrc!commpre.nmk(trunk.10) $
+# $HopeName: MMsrc!commpre.nmk(trunk.11) $
 # Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 #
 # DESCRIPTION
@@ -49,28 +49,28 @@
 !IFNDEF PFMDEFS
 !ERROR commpre.nmk: PFMDEFS not defined
 !ENDIF
-!IFNDEF MPMOBJ
+!IFNDEF MPM
 !ERROR commpre.nmk: MPM not defined
 !ENDIF
-!IFNDEF PLINTHOBJ
+!IFNDEF PLINTH
 !ERROR commpre.nmk: PLINTH not defined
 !ENDIF
-!IFNDEF LOOBJ
+!IFNDEF LO
 !ERROR commpre.nmk: LO not defined
 !ENDIF
-!IFNDEF AMCOBJ
+!IFNDEF AMC
 !ERROR commpre.nmk: AMC not defined
 !ENDIF
-!IFNDEF AMSOBJ
+!IFNDEF AMS
 !ERROR commpre.nmk: AMS not defined
 !ENDIF
-!IFNDEF DWOBJ
+!IFNDEF DW
 !ERROR commpre.nmk: DW not defined
 !ENDIF
-!IFNDEF SWOBJ
+!IFNDEF SW
 !ERROR commpre.nmk: SW not defined
 !ENDIF
-!IFNDEF TESTLIBOBJ
+!IFNDEF TESTLIB
 !ERROR commpre.nmk: TESTLIB not defined
 !ENDIF
 
@@ -100,7 +100,8 @@ CFLAGSTARGET = /ML /DCONFIG_PROD_EPCORE
 !elseif "$(TARGET)" == "epvmss.exe"
 CFLAGSTARGET = /ML /DCONFIG_PROD_EPCORE
 !elseif "$(TARGET)" == "mmdw.lib"
-CFLAGSTARGET = /MT /DCONFIG_PROD_DYLAN
+# /Oy- is actually 86-specific, but Dylan is only built for that platform
+CFLAGSTARGET = /MT /DCONFIG_PROD_DYLAN /Oy-
 !else
 CFLAGSTARGET = /MT /DCONFIG_PROD_MPS
 !endif
@@ -109,7 +110,7 @@ CFLAGSTARGET = /MT /DCONFIG_PROD_MPS
 CFLAGSCOMMON = /nologo /W4 /WX $(PFMDEFS) $(CFLAGSTARGET)
 
 # Flags for use in the variety combinations
-CFLAGSHOT = /O2 /DNDEBUG /Oy-
+CFLAGSHOT = /O2 /DNDEBUG
 CFLAGSCOOL = 
 CFLAGSINTERNAL = /Z7
 CFLAGSEXTERNAL =