diff options
| author | Richard Brooksby | 2012-09-02 11:37:27 +0100 |
|---|---|---|
| committer | Richard Brooksby | 2012-09-02 11:37:27 +0100 |
| commit | fa7749327be324fb3398aa37bd2eb786e4fef659 (patch) | |
| tree | 89eccfd0b4619f9039b85613786af8d5f8cb3afe | |
| parent | ee4106393acc41b1b4c600fa5d0d0d667a03ce36 (diff) | |
| download | emacs-fa7749327be324fb3398aa37bd2eb786e4fef659.tar.gz emacs-fa7749327be324fb3398aa37bd2eb786e4fef659.zip | |
Fixing flags for hot and cool varieties.
Copied from Perforce
Change: 179171
ServerID: perforce.ravenbrook.com
| -rw-r--r-- | mps/code/w3i3mv.nmk | 12 | ||||
| -rw-r--r-- | mps/code/w3i6mv.nmk | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk index 3c4969309f6..604a16cb2bc 100644 --- a/mps/code/w3i3mv.nmk +++ b/mps/code/w3i3mv.nmk | |||
| @@ -48,9 +48,9 @@ TESTLIB = <testlib> | |||
| 48 | # libraries | 48 | # libraries |
| 49 | 49 | ||
| 50 | !IF "$(VARIETY)" == "hot" | 50 | !IF "$(VARIETY)" == "hot" |
| 51 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFHE) $(CFLAGSCOMMONPOST) | 51 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST) |
| 52 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHE) | 52 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT) |
| 53 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHE) | 53 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT) |
| 54 | MPMOBJ0 = $(MPM:<=w3i3mv\hot\) | 54 | MPMOBJ0 = $(MPM:<=w3i3mv\hot\) |
| 55 | MPMOBJ = $(MPMOBJ0:>=.obj) | 55 | MPMOBJ = $(MPMOBJ0:>=.obj) |
| 56 | PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hot\) | 56 | PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hot\) |
| @@ -106,9 +106,9 @@ TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\) | |||
| 106 | TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) | 106 | TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) |
| 107 | 107 | ||
| 108 | !ELSEIF "$(VARIETY)" == "cool" | 108 | !ELSEIF "$(VARIETY)" == "cool" |
| 109 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST) | 109 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST) |
| 110 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI) | 110 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL) |
| 111 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCI) | 111 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL) |
| 112 | MPMOBJ0 = $(MPM:<=w3i3mv\cool\) | 112 | MPMOBJ0 = $(MPM:<=w3i3mv\cool\) |
| 113 | MPMOBJ = $(MPMOBJ0:>=.obj) | 113 | MPMOBJ = $(MPMOBJ0:>=.obj) |
| 114 | PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cool\) | 114 | PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cool\) |
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk index bf5b6efa68d..4bb3325f691 100644 --- a/mps/code/w3i6mv.nmk +++ b/mps/code/w3i6mv.nmk | |||
| @@ -50,9 +50,9 @@ TESTLIB = <testlib> | |||
| 50 | # libraries | 50 | # libraries |
| 51 | 51 | ||
| 52 | !IF "$(VARIETY)" == "hot" | 52 | !IF "$(VARIETY)" == "hot" |
| 53 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFHE) $(CFLAGSCOMMONPOST) | 53 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST) |
| 54 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHE) | 54 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT) |
| 55 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHE) | 55 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT) |
| 56 | MPMOBJ0 = $(MPM:<=w3i6mv\hot\) | 56 | MPMOBJ0 = $(MPM:<=w3i6mv\hot\) |
| 57 | MPMOBJ = $(MPMOBJ0:>=.obj) | 57 | MPMOBJ = $(MPMOBJ0:>=.obj) |
| 58 | PLINTHOBJ0 = $(PLINTH:<=w3i6mv\hot\) | 58 | PLINTHOBJ0 = $(PLINTH:<=w3i6mv\hot\) |
| @@ -108,9 +108,9 @@ TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\di\) | |||
| 108 | TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) | 108 | TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) |
| 109 | 109 | ||
| 110 | !ELSEIF "$(VARIETY)" == "cool" | 110 | !ELSEIF "$(VARIETY)" == "cool" |
| 111 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST) | 111 | CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST) |
| 112 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI) | 112 | LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL) |
| 113 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCI) | 113 | LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL) |
| 114 | MPMOBJ0 = $(MPM:<=w3i6mv\cool\) | 114 | MPMOBJ0 = $(MPM:<=w3i6mv\cool\) |
| 115 | MPMOBJ = $(MPMOBJ0:>=.obj) | 115 | MPMOBJ = $(MPMOBJ0:>=.obj) |
| 116 | PLINTHOBJ0 = $(PLINTH:<=w3i6mv\cool\) | 116 | PLINTHOBJ0 = $(PLINTH:<=w3i6mv\cool\) |