aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code
diff options
context:
space:
mode:
authorRichard Brooksby2012-09-02 12:27:20 +0100
committerRichard Brooksby2012-09-02 12:27:20 +0100
commit894ce316996bce7d9abc29efb28890aa116d8909 (patch)
tree540b5f47e3fa3c409204c99707bfb66959f7872d /mps/code
parentfa7749327be324fb3398aa37bd2eb786e4fef659 (diff)
downloademacs-894ce316996bce7d9abc29efb28890aa116d8909.tar.gz
emacs-894ce316996bce7d9abc29efb28890aa116d8909.zip
Merging the plinth and default pools into the mps library, as on other platforms, and building the tests using the library rather than object files.
Copied from Perforce Change: 179172 ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
-rw-r--r--mps/code/commpost.nmk124
-rw-r--r--mps/code/w3i3mv.nmk88
-rw-r--r--mps/code/w3i6mv.nmk88
3 files changed, 87 insertions, 213 deletions
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index d150a37df10..05ed6a0ba84 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -20,7 +20,7 @@ all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe
20 abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \ 20 abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
21 locbwcss.exe locusss.exe zcoll.exe zmess.exe \ 21 locbwcss.exe locusss.exe zcoll.exe zmess.exe \
22 eventcnv.exe \ 22 eventcnv.exe \
23 mps.lib mpsplan.lib 23 mps.lib
24 24
25 25
26# Convenience targets 26# Convenience targets
@@ -37,7 +37,7 @@ mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awlu
37 walkt0.exe locbwcss.exe locusss.exe \ 37 walkt0.exe locbwcss.exe locusss.exe \
38 exposet0.exe zcoll.exe zmess.exe \ 38 exposet0.exe zcoll.exe zmess.exe \
39 replay.exe replaysw.exe eventcnv.exe \ 39 replay.exe replaysw.exe eventcnv.exe \
40 mps.lib mpsplan.lib mpsplcb.lib \ 40 mps.lib mpsplcb.lib \
41 mpsdy.dll: 41 mpsdy.dll:
42!IFDEF VARIETY 42!IFDEF VARIETY
43 $(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety 43 $(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety
@@ -91,115 +91,101 @@ mpsicv.cov:
91!IFDEF VARIETY 91!IFDEF VARIETY
92 92
93$(PFM)\$(VARIETY)\finalcv.exe: $(PFM)\$(VARIETY)\finalcv.obj \ 93$(PFM)\$(VARIETY)\finalcv.exe: $(PFM)\$(VARIETY)\finalcv.obj \
94 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \ 94 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
95 $(MRGOBJ) $(TESTLIBOBJ)
96 95
97$(PFM)\$(VARIETY)\finaltest.exe: $(PFM)\$(VARIETY)\finaltest.obj \ 96$(PFM)\$(VARIETY)\finaltest.exe: $(PFM)\$(VARIETY)\finaltest.obj \
98 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \ 97 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
99 $(MRGOBJ) $(TESTLIBOBJ)
100 98
101$(PFM)\$(VARIETY)\expt825.exe: $(PFM)\$(VARIETY)\expt825.obj \ 99$(PFM)\$(VARIETY)\expt825.exe: $(PFM)\$(VARIETY)\expt825.obj \
102 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \ 100 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
103 $(MRGOBJ) $(TESTLIBOBJ)
104 101
105$(PFM)\$(VARIETY)\locv.exe: $(PFM)\$(VARIETY)\locv.obj \ 102$(PFM)\$(VARIETY)\locv.exe: $(PFM)\$(VARIETY)\locv.obj \
106 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) 103 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
107 104
108$(PFM)\$(VARIETY)\mpmss.exe: $(PFM)\$(VARIETY)\mpmss.obj \ 105$(PFM)\$(VARIETY)\mpmss.exe: $(PFM)\$(VARIETY)\mpmss.obj \
109 $(PFM)\$(VARIETY)\poolmvff.obj \ 106 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
110 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
111 107
112$(PFM)\$(VARIETY)\apss.exe: $(PFM)\$(VARIETY)\apss.obj \ 108$(PFM)\$(VARIETY)\apss.exe: $(PFM)\$(VARIETY)\apss.obj \
113 $(PFM)\$(VARIETY)\poolmvff.obj \ 109 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
114 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
115 110
116$(PFM)\$(VARIETY)\sacss.exe: $(PFM)\$(VARIETY)\sacss.obj \ 111$(PFM)\$(VARIETY)\sacss.exe: $(PFM)\$(VARIETY)\sacss.obj \
117 $(PFM)\$(VARIETY)\poolmvff.obj \ 112 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
118 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
119 113
120$(PFM)\$(VARIETY)\bttest.exe: $(PFM)\$(VARIETY)\bttest.obj \ 114$(PFM)\$(VARIETY)\bttest.exe: $(PFM)\$(VARIETY)\bttest.obj \
121 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 115 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
122 116
123$(PFM)\$(VARIETY)\teletest.exe: $(PFM)\$(VARIETY)\teletest.obj \ 117$(PFM)\$(VARIETY)\teletest.exe: $(PFM)\$(VARIETY)\teletest.obj \
124 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 118 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
125 119
126$(PFM)\$(VARIETY)\lockcov.exe: $(PFM)\$(VARIETY)\lockcov.obj \ 120$(PFM)\$(VARIETY)\lockcov.exe: $(PFM)\$(VARIETY)\lockcov.obj \
127 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 121 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
128 122
129$(PFM)\$(VARIETY)\lockutw3.exe: $(PFM)\$(VARIETY)\lockutw3.obj \ 123$(PFM)\$(VARIETY)\lockutw3.exe: $(PFM)\$(VARIETY)\lockutw3.obj \
130 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 124 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
131 125
132$(PFM)\$(VARIETY)\mpsicv.exe: $(PFM)\$(VARIETY)\mpsicv.obj \ 126$(PFM)\$(VARIETY)\mpsicv.exe: $(PFM)\$(VARIETY)\mpsicv.obj \
133 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 127 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
134 $(TESTLIBOBJ)
135 128
136$(PFM)\$(VARIETY)\amcss.exe: $(PFM)\$(VARIETY)\amcss.obj \ 129$(PFM)\$(VARIETY)\amcss.exe: $(PFM)\$(VARIETY)\amcss.obj \
137 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 130 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
138 $(TESTLIBOBJ)
139 131
140$(PFM)\$(VARIETY)\amcsshe.exe: $(PFM)\$(VARIETY)\amcsshe.obj \ 132$(PFM)\$(VARIETY)\amcsshe.exe: $(PFM)\$(VARIETY)\amcsshe.obj \
141 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 133 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
142 $(TESTLIBOBJ)
143 134
144$(PFM)\$(VARIETY)\amsss.exe: $(PFM)\$(VARIETY)\amsss.obj \ 135$(PFM)\$(VARIETY)\amsss.exe: $(PFM)\$(VARIETY)\amsss.obj \
145 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 136 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
146 $(TESTLIBOBJ)
147 137
148$(PFM)\$(VARIETY)\amssshe.exe: $(PFM)\$(VARIETY)\amssshe.obj \ 138$(PFM)\$(VARIETY)\amssshe.exe: $(PFM)\$(VARIETY)\amssshe.obj \
149 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 139 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
150 $(TESTLIBOBJ)
151 140
152$(PFM)\$(VARIETY)\segsmss.exe: $(PFM)\$(VARIETY)\segsmss.obj \ 141$(PFM)\$(VARIETY)\segsmss.exe: $(PFM)\$(VARIETY)\segsmss.obj \
153 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 142 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
154 $(TESTLIBOBJ)
155 143
156$(PFM)\$(VARIETY)\locbwcss.exe: $(PFM)\$(VARIETY)\locbwcss.obj \ 144$(PFM)\$(VARIETY)\locbwcss.exe: $(PFM)\$(VARIETY)\locbwcss.obj \
157 $(PFM)\$(VARIETY)\poolmvff.obj \ 145 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
158 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
159 146
160$(PFM)\$(VARIETY)\locusss.exe: $(PFM)\$(VARIETY)\locusss.obj \ 147$(PFM)\$(VARIETY)\locusss.exe: $(PFM)\$(VARIETY)\locusss.obj \
161 $(PFM)\$(VARIETY)\poolmvff.obj \ 148 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
162 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
163 149
164$(PFM)\$(VARIETY)\dwstress.exe: $(PFM)\$(VARIETY)\dwstress.obj \ 150$(PFM)\$(VARIETY)\dwstress.exe: $(PFM)\$(VARIETY)\dwstress.obj \
165 $(DWOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) 151 $(DWOBJ) $(PFM)\$(VARIETY)\mps.lib
166 152
167$(PFM)\$(VARIETY)\awlut.exe: $(PFM)\$(VARIETY)\awlut.obj \ 153$(PFM)\$(VARIETY)\awlut.exe: $(PFM)\$(VARIETY)\awlut.obj \
168 $(FMTTESTOBJ) \ 154 $(FMTTESTOBJ) \
169 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ) 155 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
170 156
171$(PFM)\$(VARIETY)\awluthe.exe: $(PFM)\$(VARIETY)\awluthe.obj \ 157$(PFM)\$(VARIETY)\awluthe.exe: $(PFM)\$(VARIETY)\awluthe.obj \
172 $(FMTTESTOBJ) \ 158 $(FMTTESTOBJ) \
173 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ) 159 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
174 160
175$(PFM)\$(VARIETY)\poolncv.exe: $(PFM)\$(VARIETY)\poolncv.obj \ 161$(PFM)\$(VARIETY)\poolncv.exe: $(PFM)\$(VARIETY)\poolncv.obj \
176 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(POOLNOBJ) 162 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
177 163
178$(PFM)\$(VARIETY)\qs.exe: $(PFM)\$(VARIETY)\qs.obj \ 164$(PFM)\$(VARIETY)\qs.exe: $(PFM)\$(VARIETY)\qs.obj \
179 $(AMCOBJ) $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 165 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
180 166
181$(PFM)\$(VARIETY)\arenacv.exe: $(PFM)\$(VARIETY)\arenacv.obj \ 167$(PFM)\$(VARIETY)\arenacv.exe: $(PFM)\$(VARIETY)\arenacv.obj \
182 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 168 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
183 169
184$(PFM)\$(VARIETY)\abqtest.exe: $(PFM)\$(VARIETY)\abqtest.obj \ 170$(PFM)\$(VARIETY)\abqtest.exe: $(PFM)\$(VARIETY)\abqtest.obj \
185 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 171 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
186 172
187$(PFM)\$(VARIETY)\cbstest.exe: $(PFM)\$(VARIETY)\cbstest.obj \ 173$(PFM)\$(VARIETY)\cbstest.exe: $(PFM)\$(VARIETY)\cbstest.obj \
188 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 174 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
189 175
190$(PFM)\$(VARIETY)\btcv.exe: $(PFM)\$(VARIETY)\btcv.obj \ 176$(PFM)\$(VARIETY)\btcv.exe: $(PFM)\$(VARIETY)\btcv.obj \
191 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 177 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
192 178
193$(PFM)\$(VARIETY)\mv2test.exe: $(PFM)\$(VARIETY)\mv2test.obj \ 179$(PFM)\$(VARIETY)\mv2test.exe: $(PFM)\$(VARIETY)\mv2test.obj \
194 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 180 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
195 181
196$(PFM)\$(VARIETY)\zcoll.exe: $(PFM)\$(VARIETY)\zcoll.obj \ 182$(PFM)\$(VARIETY)\zcoll.exe: $(PFM)\$(VARIETY)\zcoll.obj \
197 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \ 183 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) \
198 $(MRGOBJ) $(TESTLIBOBJ) 184 $(TESTLIBOBJ)
199 185
200$(PFM)\$(VARIETY)\zmess.exe: $(PFM)\$(VARIETY)\zmess.obj \ 186$(PFM)\$(VARIETY)\zmess.exe: $(PFM)\$(VARIETY)\zmess.obj \
201 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \ 187 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) \
202 $(MRGOBJ) $(TESTLIBOBJ) 188 $(TESTLIBOBJ)
203 189
204$(PFM)\$(VARIETY)\eventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \ 190$(PFM)\$(VARIETY)\eventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \
205 $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj 191 $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj
@@ -207,8 +193,7 @@ $(PFM)\$(VARIETY)\eventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \
207$(PFM)\$(VARIETY)\replay.exe: $(PFM)\$(VARIETY)\replay.obj \ 193$(PFM)\$(VARIETY)\replay.exe: $(PFM)\$(VARIETY)\replay.obj \
208 $(PFM)\$(VARIETY)\eventrep.obj \ 194 $(PFM)\$(VARIETY)\eventrep.obj \
209 $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj \ 195 $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj \
210 $(MPMOBJ) $(AWLOBJ) $(AMSOBJ) $(POOLNOBJ) $(AMCOBJ) $(SNCOBJ) \ 196 $(PFM)\$(VARIETY)\mps.lib
211 $(PFM)\$(VARIETY)\poolmvff.obj $(PFM)\$(VARIETY)\mpsliban.obj
212 197
213# Have to rename the object file, because the names must match, or 198# Have to rename the object file, because the names must match, or
214# the template rule for .exe.obj won't be used. 199# the template rule for .exe.obj won't be used.
@@ -216,29 +201,21 @@ $(PFM)\$(VARIETY)\replaysw.obj: $(PFM)\$(VARIETY)\replay.obj
216 $(ECHO) $@ 201 $(ECHO) $@
217 copy $** $@ >nul: 202 copy $** $@ >nul:
218 203
219$(PFM)\$(VARIETY)\replaysw.exe: $(PFM)\$(VARIETY)\replaysw.obj \
220 $(PFM)\$(VARIETY)\eventrep.obj \
221 $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj \
222 $(PFM)\$(VARIETY)\fmtpstst.obj $(TESTLIBOBJ) \
223 $(PFM)\$(VARIETY)\mpsliban.obj $(SWOBJ)
224
225$(PFM)\$(VARIETY)\messtest.exe: $(PFM)\$(VARIETY)\messtest.obj \ 204$(PFM)\$(VARIETY)\messtest.exe: $(PFM)\$(VARIETY)\messtest.obj \
226 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 205 $(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
227 206
228$(PFM)\$(VARIETY)\steptest.exe: $(PFM)\$(VARIETY)\steptest.obj \ 207$(PFM)\$(VARIETY)\steptest.exe: $(PFM)\$(VARIETY)\steptest.obj \
229 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 208 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
230 $(TESTLIBOBJ)
231 209
232$(PFM)\$(VARIETY)\walkt0.exe: $(PFM)\$(VARIETY)\walkt0.obj \ 210$(PFM)\$(VARIETY)\walkt0.exe: $(PFM)\$(VARIETY)\walkt0.obj \
233 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 211 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
234 $(TESTLIBOBJ)
235 212
236$(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \ 213$(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \
237 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \ 214 $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
238 $(TESTLIBOBJ)
239 215
240$(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ 216$(PFM)\$(VARIETY)\mps.lib: \
241 $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) 217 $(MPMOBJ) $(AMCOBJ) $(AMSOBJ) $(AWLOBJ) $(LOOBJ) $(SNCOBJ) \
218 $(MVFFOBJ) $(PLINTHOBJ) $(POOLNOBJ)
242 $(ECHO) $@ 219 $(ECHO) $@
243 cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c 220 cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c
244 $(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o 221 $(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o
@@ -248,20 +225,16 @@ $(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
248# but this is not to be treated as an object on the linker line. Sorry 225# but this is not to be treated as an object on the linker line. Sorry
249# about the repetition of the object list. 226# about the repetition of the object list.
250$(PFM)\$(VARIETY)\mpsdy.dll: $(PFM)\$(VARIETY)\mpslibcb.obj \ 227$(PFM)\$(VARIETY)\mpsdy.dll: $(PFM)\$(VARIETY)\mpslibcb.obj \
251 $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ 228 $(MPMOBJ) $(LOOBJ) $(SNCOBJ) \
252 $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) w3gen.def \ 229 $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) w3gen.def \
253 mpslibcb.def 230 mpslibcb.def
254 $(ECHO) $@ 231 $(ECHO) $@
255 $(LINKER) $(LINKFLAGS) /def:w3gen.def \ 232 $(LINKER) $(LINKFLAGS) /def:w3gen.def \
256 /def:mpslibcb.def /dll /OUT:$@ \ 233 /def:mpslibcb.def /dll /OUT:$@ \
257 $(PFM)\$(VARIETY)\mpslibcb.obj \ 234 $(PFM)\$(VARIETY)\mpslibcb.obj \
258 $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \ 235 $(MPMOBJ) $(LOOBJ) $(SNCOBJ) \
259 $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) 236 $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ)
260 237
261$(PFM)\$(VARIETY)\mpsplan.lib: $(PLINTHOBJ)
262 $(ECHO) $@
263 $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
264
265$(PFM)\$(VARIETY)\mpsplcb.lib: $(PFM)\$(VARIETY)\mpslibcb.obj 238$(PFM)\$(VARIETY)\mpsplcb.lib: $(PFM)\$(VARIETY)\mpslibcb.obj
266 $(ECHO) $@ 239 $(ECHO) $@
267 $(LIBMAN) $(LIBFLAGS) /OUT:$@ $** 240 $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
@@ -299,8 +272,7 @@ $(PFM)\$(VARIETY)\mpsplcb.lib: $(PFM)\$(VARIETY)\mpslibcb.obj
299 272
300{$(PFM)\$(VARIETY)}.obj{$(PFM)\$(VARIETY)}.exe: 273{$(PFM)\$(VARIETY)}.obj{$(PFM)\$(VARIETY)}.exe:
301 $(ECHO) $@ 274 $(ECHO) $@
302 cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c 275 $(LINKER) $(LINKFLAGS) /PDB:$*.pdb /OUT:$@ $(**)
303 $(LINKER) $(LINKFLAGS) /PDB:$*.pdb /OUT:$@ $(**) $(PFM)\$(VARIETY)\version.o
304 276
305 277
306# C. COPYRIGHT AND LICENSE 278# C. COPYRIGHT AND LICENSE
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 604a16cb2bc..18f307dfbd9 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -5,9 +5,6 @@
5 5
6PFM = w3i3mv 6PFM = w3i3mv
7 7
8RAINBOWPATH = MSVISUAL\WIN32\I386
9DONGLELIB = $(RAINBOWPATH)\spromeps.lib
10
11# /Gs appears to be necessary to suppress stack checks. Stack checks 8# /Gs appears to be necessary to suppress stack checks. Stack checks
12# (if not suppressed) generate a dependency on the C library, __chkesp, 9# (if not suppressed) generate a dependency on the C library, __chkesp,
13# which causes the linker step to fail when building the DLL, mpsdy.dll. 10# which causes the linker step to fail when building the DLL, mpsdy.dll.
@@ -29,6 +26,8 @@ AMS = <poolams> <poolamsi>
29AWL = <poolawl> 26AWL = <poolawl>
30LO = <poollo> 27LO = <poollo>
31SNC = <poolsnc> 28SNC = <poolsnc>
29MVFF = <poolmvff>
30N = <pooln>
32DW = <fmtdy> <fmtno> 31DW = <fmtdy> <fmtno>
33FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst> 32FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
34POOLN = <pooln> 33POOLN = <pooln>
@@ -52,145 +51,85 @@ CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST)
52LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT) 51LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT)
53LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT) 52LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT)
54MPMOBJ0 = $(MPM:<=w3i3mv\hot\) 53MPMOBJ0 = $(MPM:<=w3i3mv\hot\)
55MPMOBJ = $(MPMOBJ0:>=.obj)
56PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hot\) 54PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hot\)
57PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
58SWOBJ0 = $(SW:<=w3i3mv\hot\)
59SWOBJ = $(SWOBJ0:>=.obj)
60AMSOBJ0 = $(AMS:<=w3i3mv\hot\) 55AMSOBJ0 = $(AMS:<=w3i3mv\hot\)
61AMSOBJ = $(AMSOBJ0:>=.obj)
62AMCOBJ0 = $(AMC:<=w3i3mv\hot\) 56AMCOBJ0 = $(AMC:<=w3i3mv\hot\)
63AMCOBJ = $(AMCOBJ0:>=.obj)
64AWLOBJ0 = $(AWL:<=w3i3mv\hot\) 57AWLOBJ0 = $(AWL:<=w3i3mv\hot\)
65AWLOBJ = $(AWLOBJ0:>=.obj)
66LOOBJ0 = $(LO:<=w3i3mv\hot\) 58LOOBJ0 = $(LO:<=w3i3mv\hot\)
67LOOBJ = $(LOOBJ0:>=.obj)
68SNCOBJ0 = $(SNC:<=w3i3mv\hot\) 59SNCOBJ0 = $(SNC:<=w3i3mv\hot\)
69SNCOBJ = $(SNCOBJ0:>=.obj) 60MVFFOBJ0 = $(MVFF:<=w3i3mv\hot\)
70DWOBJ0 = $(DW:<=w3i3mv\hot\) 61DWOBJ0 = $(DW:<=w3i3mv\hot\)
71DWOBJ = $(DWOBJ0:>=.obj)
72FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hot\) 62FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hot\)
73FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
74POOLNOBJ0 = $(POOLN:<=w3i3mv\hot\) 63POOLNOBJ0 = $(POOLN:<=w3i3mv\hot\)
75POOLNOBJ = $(POOLNOBJ0:>=.obj)
76TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hot\) 64TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hot\)
77TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
78 65
79!ELSEIF "$(VARIETY)" == "di" 66!ELSEIF "$(VARIETY)" == "di"
80CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST) 67CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
81LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI) 68LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
82LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI) 69LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
83MPMOBJ0 = $(MPM:<=w3i3mv\di\) 70MPMOBJ0 = $(MPM:<=w3i3mv\di\)
84MPMOBJ = $(MPMOBJ0:>=.obj)
85PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\) 71PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\)
86PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
87SWOBJ0 = $(SW:<=w3i3mv\di\)
88SWOBJ = $(SWOBJ0:>=.obj)
89AMSOBJ0 = $(AMS:<=w3i3mv\di\) 72AMSOBJ0 = $(AMS:<=w3i3mv\di\)
90AMSOBJ = $(AMSOBJ0:>=.obj)
91AMCOBJ0 = $(AMC:<=w3i3mv\di\) 73AMCOBJ0 = $(AMC:<=w3i3mv\di\)
92AMCOBJ = $(AMCOBJ0:>=.obj)
93AWLOBJ0 = $(AWL:<=w3i3mv\di\) 74AWLOBJ0 = $(AWL:<=w3i3mv\di\)
94AWLOBJ = $(AWLOBJ0:>=.obj)
95LOOBJ0 = $(LO:<=w3i3mv\di\) 75LOOBJ0 = $(LO:<=w3i3mv\di\)
96LOOBJ = $(LOOBJ0:>=.obj)
97SNCOBJ0 = $(SNC:<=w3i3mv\di\) 76SNCOBJ0 = $(SNC:<=w3i3mv\di\)
98SNCOBJ = $(SNCOBJ0:>=.obj) 77MVFFOBJ0 = $(MVFF:<=w3i3mv\di\)
99DWOBJ0 = $(DW:<=w3i3mv\di\) 78DWOBJ0 = $(DW:<=w3i3mv\di\)
100DWOBJ = $(DWOBJ0:>=.obj)
101FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\) 79FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\)
102FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
103POOLNOBJ0 = $(POOLN:<=w3i3mv\di\) 80POOLNOBJ0 = $(POOLN:<=w3i3mv\di\)
104POOLNOBJ = $(POOLNOBJ0:>=.obj)
105TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\) 81TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\)
106TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
107 82
108!ELSEIF "$(VARIETY)" == "cool" 83!ELSEIF "$(VARIETY)" == "cool"
109CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST) 84CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
110LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL) 85LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL)
111LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL) 86LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL)
112MPMOBJ0 = $(MPM:<=w3i3mv\cool\) 87MPMOBJ0 = $(MPM:<=w3i3mv\cool\)
113MPMOBJ = $(MPMOBJ0:>=.obj)
114PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cool\) 88PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cool\)
115PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
116SWOBJ0 = $(SW:<=w3i3mv\cool\)
117SWOBJ = $(SWOBJ0:>=.obj)
118AMSOBJ0 = $(AMS:<=w3i3mv\cool\) 89AMSOBJ0 = $(AMS:<=w3i3mv\cool\)
119AMSOBJ = $(AMSOBJ0:>=.obj)
120AMCOBJ0 = $(AMC:<=w3i3mv\cool\) 90AMCOBJ0 = $(AMC:<=w3i3mv\cool\)
121AMCOBJ = $(AMCOBJ0:>=.obj)
122AWLOBJ0 = $(AWL:<=w3i3mv\cool\) 91AWLOBJ0 = $(AWL:<=w3i3mv\cool\)
123AWLOBJ = $(AWLOBJ0:>=.obj)
124LOOBJ0 = $(LO:<=w3i3mv\cool\) 92LOOBJ0 = $(LO:<=w3i3mv\cool\)
125LOOBJ = $(LOOBJ0:>=.obj)
126SNCOBJ0 = $(SNC:<=w3i3mv\cool\) 93SNCOBJ0 = $(SNC:<=w3i3mv\cool\)
127SNCOBJ = $(SNCOBJ0:>=.obj) 94MVFFOBJ0 = $(MVFF:<=w3i3mv\cool\)
128DWOBJ0 = $(DW:<=w3i3mv\cool\) 95DWOBJ0 = $(DW:<=w3i3mv\cool\)
129DWOBJ = $(DWOBJ0:>=.obj)
130FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\cool\) 96FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\cool\)
131FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
132POOLNOBJ0 = $(POOLN:<=w3i3mv\cool\) 97POOLNOBJ0 = $(POOLN:<=w3i3mv\cool\)
133POOLNOBJ = $(POOLNOBJ0:>=.obj)
134TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cool\) 98TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cool\)
135TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
136 99
137!ELSEIF "$(VARIETY)" == "ti" 100!ELSEIF "$(VARIETY)" == "ti"
138CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST) 101CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST)
139LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI) 102LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI)
140LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI) 103LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI)
141MPMOBJ0 = $(MPM:<=w3i3mv\ti\) 104MPMOBJ0 = $(MPM:<=w3i3mv\ti\)
142MPMOBJ = $(MPMOBJ0:>=.obj)
143PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ti\) 105PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ti\)
144PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
145SWOBJ0 = $(SW:<=w3i3mv\ti\)
146SWOBJ = $(SWOBJ0:>=.obj)
147AMSOBJ0 = $(AMS:<=w3i3mv\ti\) 106AMSOBJ0 = $(AMS:<=w3i3mv\ti\)
148AMSOBJ = $(AMSOBJ0:>=.obj)
149AMCOBJ0 = $(AMC:<=w3i3mv\ti\) 107AMCOBJ0 = $(AMC:<=w3i3mv\ti\)
150AMCOBJ = $(AMCOBJ0:>=.obj)
151AWLOBJ0 = $(AWL:<=w3i3mv\ti\) 108AWLOBJ0 = $(AWL:<=w3i3mv\ti\)
152AWLOBJ = $(AWLOBJ0:>=.obj)
153LOOBJ0 = $(LO:<=w3i3mv\ti\) 109LOOBJ0 = $(LO:<=w3i3mv\ti\)
154LOOBJ = $(LOOBJ0:>=.obj)
155SNCOBJ0 = $(SNC:<=w3i3mv\ti\) 110SNCOBJ0 = $(SNC:<=w3i3mv\ti\)
156SNCOBJ = $(SNCOBJ0:>=.obj) 111MVFFOBJ0 = $(MVFF:<=w3i3mv\ti\)
157DWOBJ0 = $(DW:<=w3i3mv\ti\) 112DWOBJ0 = $(DW:<=w3i3mv\ti\)
158DWOBJ = $(DWOBJ0:>=.obj)
159FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\) 113FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\)
160FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
161POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\) 114POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\)
162POOLNOBJ = $(POOLNOBJ0:>=.obj)
163TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\) 115TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
164TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
165 116
166!ELSEIF "$(VARIETY)" == "we" 117!ELSEIF "$(VARIETY)" == "we"
167CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST) 118CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
168LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE) 119LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
169LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE) 120LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE)
170MPMOBJ0 = $(MPM:<=w3i3mv\we\) 121MPMOBJ0 = $(MPM:<=w3i3mv\we\)
171MPMOBJ = $(MPMOBJ0:>=.obj)
172PLINTHOBJ0 = $(PLINTH:<=w3i3mv\we\) 122PLINTHOBJ0 = $(PLINTH:<=w3i3mv\we\)
173PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
174SWOBJ0 = $(SW:<=w3i3mv\we\)
175SWOBJ = $(SWOBJ0:>=.obj)
176AMSOBJ0 = $(AMS:<=w3i3mv\we\) 123AMSOBJ0 = $(AMS:<=w3i3mv\we\)
177AMSOBJ = $(AMSOBJ0:>=.obj)
178AMCOBJ0 = $(AMC:<=w3i3mv\we\) 124AMCOBJ0 = $(AMC:<=w3i3mv\we\)
179AMCOBJ = $(AMCOBJ0:>=.obj)
180AWLOBJ0 = $(AWL:<=w3i3mv\we\) 125AWLOBJ0 = $(AWL:<=w3i3mv\we\)
181AWLOBJ = $(AWLOBJ0:>=.obj)
182LOOBJ0 = $(LO:<=w3i3mv\we\) 126LOOBJ0 = $(LO:<=w3i3mv\we\)
183LOOBJ = $(LOOBJ0:>=.obj)
184SNCOBJ0 = $(SNC:<=w3i3mv\we\) 127SNCOBJ0 = $(SNC:<=w3i3mv\we\)
185SNCOBJ = $(SNCOBJ0:>=.obj) 128MVFFOBJ0 = $(MVFF:<=w3i3mv\we\)
186DWOBJ0 = $(DW:<=w3i3mv\we\) 129DWOBJ0 = $(DW:<=w3i3mv\we\)
187DWOBJ = $(DWOBJ0:>=.obj)
188FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\) 130FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\)
189FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
190POOLNOBJ0 = $(POOLN:<=w3i3mv\we\) 131POOLNOBJ0 = $(POOLN:<=w3i3mv\we\)
191POOLNOBJ = $(POOLNOBJ0:>=.obj)
192TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\) 132TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\)
193TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
194 133
195#!ELSEIF "$(VARIETY)" == "cv" 134#!ELSEIF "$(VARIETY)" == "cv"
196#CFLAGS=$(CFLAGSCOMMON) $(CFCV) 135#CFLAGS=$(CFLAGSCOMMON) $(CFCV)
@@ -219,6 +158,19 @@ TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
219 158
220!ENDIF 159!ENDIF
221 160
161MPMOBJ = $(MPMOBJ0:>=.obj)
162PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
163AMSOBJ = $(AMSOBJ0:>=.obj)
164AMCOBJ = $(AMCOBJ0:>=.obj)
165AWLOBJ = $(AWLOBJ0:>=.obj)
166LOOBJ = $(LOOBJ0:>=.obj)
167SNCOBJ = $(SNCOBJ0:>=.obj)
168MVFFOBJ = $(MVFFOBJ0:>=.obj)
169DWOBJ = $(DWOBJ0:>=.obj)
170FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
171POOLNOBJ = $(POOLNOBJ0:>=.obj)
172TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
173
222 174
223!INCLUDE commpost.nmk 175!INCLUDE commpost.nmk
224 176
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk
index 4bb3325f691..544427281d5 100644
--- a/mps/code/w3i6mv.nmk
+++ b/mps/code/w3i6mv.nmk
@@ -5,10 +5,6 @@
5 5
6PFM = w3i6mv 6PFM = w3i6mv
7 7
8# @@@@ Can we remove this? RB 2012-03-26
9RAINBOWPATH = MSVISUAL\WIN32\I386
10DONGLELIB = $(RAINBOWPATH)\spromeps.lib
11
12# /Gs appears to be necessary to suppress stack checks. Stack checks 8# /Gs appears to be necessary to suppress stack checks. Stack checks
13# (if not suppressed) generate a dependency on the C library, __chkesp, 9# (if not suppressed) generate a dependency on the C library, __chkesp,
14# which causes the linker step to fail when building the DLL, mpsdy.dll. 10# which causes the linker step to fail when building the DLL, mpsdy.dll.
@@ -31,6 +27,7 @@ AMS = <poolams> <poolamsi>
31AWL = <poolawl> 27AWL = <poolawl>
32LO = <poollo> 28LO = <poollo>
33SNC = <poolsnc> 29SNC = <poolsnc>
30MVFF = <poolmvff>
34DW = <fmtdy> <fmtno> 31DW = <fmtdy> <fmtno>
35FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst> 32FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
36POOLN = <pooln> 33POOLN = <pooln>
@@ -54,145 +51,85 @@ CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST)
54LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT) 51LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT)
55LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT) 52LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT)
56MPMOBJ0 = $(MPM:<=w3i6mv\hot\) 53MPMOBJ0 = $(MPM:<=w3i6mv\hot\)
57MPMOBJ = $(MPMOBJ0:>=.obj)
58PLINTHOBJ0 = $(PLINTH:<=w3i6mv\hot\) 54PLINTHOBJ0 = $(PLINTH:<=w3i6mv\hot\)
59PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
60SWOBJ0 = $(SW:<=w3i6mv\hot\)
61SWOBJ = $(SWOBJ0:>=.obj)
62AMSOBJ0 = $(AMS:<=w3i6mv\hot\) 55AMSOBJ0 = $(AMS:<=w3i6mv\hot\)
63AMSOBJ = $(AMSOBJ0:>=.obj)
64AMCOBJ0 = $(AMC:<=w3i6mv\hot\) 56AMCOBJ0 = $(AMC:<=w3i6mv\hot\)
65AMCOBJ = $(AMCOBJ0:>=.obj)
66AWLOBJ0 = $(AWL:<=w3i6mv\hot\) 57AWLOBJ0 = $(AWL:<=w3i6mv\hot\)
67AWLOBJ = $(AWLOBJ0:>=.obj)
68LOOBJ0 = $(LO:<=w3i6mv\hot\) 58LOOBJ0 = $(LO:<=w3i6mv\hot\)
69LOOBJ = $(LOOBJ0:>=.obj)
70SNCOBJ0 = $(SNC:<=w3i6mv\hot\) 59SNCOBJ0 = $(SNC:<=w3i6mv\hot\)
71SNCOBJ = $(SNCOBJ0:>=.obj) 60MVFFOBJ0 = $(MVFF:<=w3i6mv\hot\)
72DWOBJ0 = $(DW:<=w3i6mv\hot\) 61DWOBJ0 = $(DW:<=w3i6mv\hot\)
73DWOBJ = $(DWOBJ0:>=.obj)
74FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\hot\) 62FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\hot\)
75FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
76POOLNOBJ0 = $(POOLN:<=w3i6mv\hot\) 63POOLNOBJ0 = $(POOLN:<=w3i6mv\hot\)
77POOLNOBJ = $(POOLNOBJ0:>=.obj)
78TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\hot\) 64TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\hot\)
79TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
80 65
81!ELSEIF "$(VARIETY)" == "di" 66!ELSEIF "$(VARIETY)" == "di"
82CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST) 67CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
83LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI) 68LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
84LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI) 69LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
85MPMOBJ0 = $(MPM:<=w3i6mv\di\) 70MPMOBJ0 = $(MPM:<=w3i6mv\di\)
86MPMOBJ = $(MPMOBJ0:>=.obj)
87PLINTHOBJ0 = $(PLINTH:<=w3i6mv\di\) 71PLINTHOBJ0 = $(PLINTH:<=w3i6mv\di\)
88PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
89SWOBJ0 = $(SW:<=w3i6mv\di\)
90SWOBJ = $(SWOBJ0:>=.obj)
91AMSOBJ0 = $(AMS:<=w3i6mv\di\) 72AMSOBJ0 = $(AMS:<=w3i6mv\di\)
92AMSOBJ = $(AMSOBJ0:>=.obj)
93AMCOBJ0 = $(AMC:<=w3i6mv\di\) 73AMCOBJ0 = $(AMC:<=w3i6mv\di\)
94AMCOBJ = $(AMCOBJ0:>=.obj)
95AWLOBJ0 = $(AWL:<=w3i6mv\di\) 74AWLOBJ0 = $(AWL:<=w3i6mv\di\)
96AWLOBJ = $(AWLOBJ0:>=.obj)
97LOOBJ0 = $(LO:<=w3i6mv\di\) 75LOOBJ0 = $(LO:<=w3i6mv\di\)
98LOOBJ = $(LOOBJ0:>=.obj)
99SNCOBJ0 = $(SNC:<=w3i6mv\di\) 76SNCOBJ0 = $(SNC:<=w3i6mv\di\)
100SNCOBJ = $(SNCOBJ0:>=.obj) 77MVFFOBJ0 = $(MVFF:<=w3i6mv\di\)
101DWOBJ0 = $(DW:<=w3i6mv\di\) 78DWOBJ0 = $(DW:<=w3i6mv\di\)
102DWOBJ = $(DWOBJ0:>=.obj)
103FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\di\) 79FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\di\)
104FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
105POOLNOBJ0 = $(POOLN:<=w3i6mv\di\) 80POOLNOBJ0 = $(POOLN:<=w3i6mv\di\)
106POOLNOBJ = $(POOLNOBJ0:>=.obj)
107TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\di\) 81TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\di\)
108TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
109 82
110!ELSEIF "$(VARIETY)" == "cool" 83!ELSEIF "$(VARIETY)" == "cool"
111CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST) 84CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
112LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL) 85LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL)
113LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL) 86LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL)
114MPMOBJ0 = $(MPM:<=w3i6mv\cool\) 87MPMOBJ0 = $(MPM:<=w3i6mv\cool\)
115MPMOBJ = $(MPMOBJ0:>=.obj)
116PLINTHOBJ0 = $(PLINTH:<=w3i6mv\cool\) 88PLINTHOBJ0 = $(PLINTH:<=w3i6mv\cool\)
117PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
118SWOBJ0 = $(SW:<=w3i6mv\cool\)
119SWOBJ = $(SWOBJ0:>=.obj)
120AMSOBJ0 = $(AMS:<=w3i6mv\cool\) 89AMSOBJ0 = $(AMS:<=w3i6mv\cool\)
121AMSOBJ = $(AMSOBJ0:>=.obj)
122AMCOBJ0 = $(AMC:<=w3i6mv\cool\) 90AMCOBJ0 = $(AMC:<=w3i6mv\cool\)
123AMCOBJ = $(AMCOBJ0:>=.obj)
124AWLOBJ0 = $(AWL:<=w3i6mv\cool\) 91AWLOBJ0 = $(AWL:<=w3i6mv\cool\)
125AWLOBJ = $(AWLOBJ0:>=.obj)
126LOOBJ0 = $(LO:<=w3i6mv\cool\) 92LOOBJ0 = $(LO:<=w3i6mv\cool\)
127LOOBJ = $(LOOBJ0:>=.obj)
128SNCOBJ0 = $(SNC:<=w3i6mv\cool\) 93SNCOBJ0 = $(SNC:<=w3i6mv\cool\)
129SNCOBJ = $(SNCOBJ0:>=.obj) 94MVFFOBJ0 = $(MVFF:<=w3i6mv\cool\)
130DWOBJ0 = $(DW:<=w3i6mv\cool\) 95DWOBJ0 = $(DW:<=w3i6mv\cool\)
131DWOBJ = $(DWOBJ0:>=.obj)
132FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\cool\) 96FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\cool\)
133FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
134POOLNOBJ0 = $(POOLN:<=w3i6mv\cool\) 97POOLNOBJ0 = $(POOLN:<=w3i6mv\cool\)
135POOLNOBJ = $(POOLNOBJ0:>=.obj)
136TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\cool\) 98TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\cool\)
137TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
138 99
139!ELSEIF "$(VARIETY)" == "ti" 100!ELSEIF "$(VARIETY)" == "ti"
140CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST) 101CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST)
141LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI) 102LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI)
142LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI) 103LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI)
143MPMOBJ0 = $(MPM:<=w3i6mv\ti\) 104MPMOBJ0 = $(MPM:<=w3i6mv\ti\)
144MPMOBJ = $(MPMOBJ0:>=.obj)
145PLINTHOBJ0 = $(PLINTH:<=w3i6mv\ti\) 105PLINTHOBJ0 = $(PLINTH:<=w3i6mv\ti\)
146PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
147SWOBJ0 = $(SW:<=w3i6mv\ti\)
148SWOBJ = $(SWOBJ0:>=.obj)
149AMSOBJ0 = $(AMS:<=w3i6mv\ti\) 106AMSOBJ0 = $(AMS:<=w3i6mv\ti\)
150AMSOBJ = $(AMSOBJ0:>=.obj)
151AMCOBJ0 = $(AMC:<=w3i6mv\ti\) 107AMCOBJ0 = $(AMC:<=w3i6mv\ti\)
152AMCOBJ = $(AMCOBJ0:>=.obj)
153AWLOBJ0 = $(AWL:<=w3i6mv\ti\) 108AWLOBJ0 = $(AWL:<=w3i6mv\ti\)
154AWLOBJ = $(AWLOBJ0:>=.obj)
155LOOBJ0 = $(LO:<=w3i6mv\ti\) 109LOOBJ0 = $(LO:<=w3i6mv\ti\)
156LOOBJ = $(LOOBJ0:>=.obj)
157SNCOBJ0 = $(SNC:<=w3i6mv\ti\) 110SNCOBJ0 = $(SNC:<=w3i6mv\ti\)
158SNCOBJ = $(SNCOBJ0:>=.obj) 111MVFFOBJ0 = $(MVFF:<=w3i6mv\ti\)
159DWOBJ0 = $(DW:<=w3i6mv\ti\) 112DWOBJ0 = $(DW:<=w3i6mv\ti\)
160DWOBJ = $(DWOBJ0:>=.obj)
161FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\ti\) 113FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\ti\)
162FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
163POOLNOBJ0 = $(POOLN:<=w3i6mv\ti\) 114POOLNOBJ0 = $(POOLN:<=w3i6mv\ti\)
164POOLNOBJ = $(POOLNOBJ0:>=.obj)
165TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\ti\) 115TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\ti\)
166TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
167 116
168!ELSEIF "$(VARIETY)" == "we" 117!ELSEIF "$(VARIETY)" == "we"
169CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST) 118CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
170LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE) 119LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
171LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE) 120LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE)
172MPMOBJ0 = $(MPM:<=w3i6mv\we\) 121MPMOBJ0 = $(MPM:<=w3i6mv\we\)
173MPMOBJ = $(MPMOBJ0:>=.obj)
174PLINTHOBJ0 = $(PLINTH:<=w3i6mv\we\) 122PLINTHOBJ0 = $(PLINTH:<=w3i6mv\we\)
175PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
176SWOBJ0 = $(SW:<=w3i6mv\we\)
177SWOBJ = $(SWOBJ0:>=.obj)
178AMSOBJ0 = $(AMS:<=w3i6mv\we\) 123AMSOBJ0 = $(AMS:<=w3i6mv\we\)
179AMSOBJ = $(AMSOBJ0:>=.obj)
180AMCOBJ0 = $(AMC:<=w3i6mv\we\) 124AMCOBJ0 = $(AMC:<=w3i6mv\we\)
181AMCOBJ = $(AMCOBJ0:>=.obj)
182AWLOBJ0 = $(AWL:<=w3i6mv\we\) 125AWLOBJ0 = $(AWL:<=w3i6mv\we\)
183AWLOBJ = $(AWLOBJ0:>=.obj)
184LOOBJ0 = $(LO:<=w3i6mv\we\) 126LOOBJ0 = $(LO:<=w3i6mv\we\)
185LOOBJ = $(LOOBJ0:>=.obj)
186SNCOBJ0 = $(SNC:<=w3i6mv\we\) 127SNCOBJ0 = $(SNC:<=w3i6mv\we\)
187SNCOBJ = $(SNCOBJ0:>=.obj) 128MVFFOBJ0 = $(MVFF:<=w3i6mv\we\)
188DWOBJ0 = $(DW:<=w3i6mv\we\) 129DWOBJ0 = $(DW:<=w3i6mv\we\)
189DWOBJ = $(DWOBJ0:>=.obj)
190FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\we\) 130FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\we\)
191FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
192POOLNOBJ0 = $(POOLN:<=w3i6mv\we\) 131POOLNOBJ0 = $(POOLN:<=w3i6mv\we\)
193POOLNOBJ = $(POOLNOBJ0:>=.obj)
194TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\we\) 132TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\we\)
195TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
196 133
197#!ELSEIF "$(VARIETY)" == "cv" 134#!ELSEIF "$(VARIETY)" == "cv"
198#CFLAGS=$(CFLAGSCOMMON) $(CFCV) 135#CFLAGS=$(CFLAGSCOMMON) $(CFCV)
@@ -221,6 +158,19 @@ TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
221 158
222!ENDIF 159!ENDIF
223 160
161MPMOBJ = $(MPMOBJ0:>=.obj)
162PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
163AMSOBJ = $(AMSOBJ0:>=.obj)
164AMCOBJ = $(AMCOBJ0:>=.obj)
165AWLOBJ = $(AWLOBJ0:>=.obj)
166LOOBJ = $(LOOBJ0:>=.obj)
167SNCOBJ = $(SNCOBJ0:>=.obj)
168MVFFOBJ = $(MVFFOBJ0:>=.obj)
169DWOBJ = $(DWOBJ0:>=.obj)
170FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
171POOLNOBJ = $(POOLNOBJ0:>=.obj)
172TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
173
224 174
225!INCLUDE commpost.nmk 175!INCLUDE commpost.nmk
226 176
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-15 05:44:00 +0000