... |
... |
@@ -121,7 +121,7 @@ GRAPHOBJ64 = $(OBJDIR)grobjs_64.obj, \ |
121
|
121
|
|
122
|
122
|
# C flags
|
123
|
123
|
CFLAGS = $(CCOPT)$(INCLUDES)/obj=$(OBJDIR)/define=("FT2_BUILD_LIBRARY=1")\
|
124
|
|
- /warn=disable=("MACROREDEF")
|
|
124
|
+ /warn=disable=("MACROREDEF","MAYLOSEDATA3")
|
125
|
125
|
|
126
|
126
|
.c.obj :
|
127
|
127
|
cc$(CFLAGS)/point=32/list=$(MMS$TARGET_NAME).lis/show=all $(MMS$SOURCE)
|
... |
... |
@@ -175,33 +175,37 @@ ftmemchk.exe : $(OBJDIR)ftmemchk.obj |
175
|
175
|
ftmemchk_64.exe : $(OBJDIR)ftmemchk.obj
|
176
|
176
|
link $(LOPTS) $(OBJDIR)ftmemchk_64.obj,[]ft2demos.opt/opt
|
177
|
177
|
ftmulti.exe : $(OBJDIR)ftmulti.obj,$(OBJDIR)common.obj,$(OBJDIR)mlgetopt.obj\
|
178
|
|
- ,$(OBJDIR)ftcommon.obj,$(OBJDIR)strbuf.obj,$(GRAPHOBJ)
|
|
178
|
+ ,$(OBJDIR)ftcommon.obj,$(OBJDIR)strbuf.obj,$(OBJDIR)rsvg-port.obj,\
|
|
179
|
+ $(GRAPHOBJ)
|
179
|
180
|
link $(LOPTS) $(OBJDIR)ftmulti.obj,common.obj,mlgetopt,ftcommon,\
|
180
|
|
- strbuf,$(GRAPHOBJ),[]ft2demos.opt/opt
|
|
181
|
+ strbuf,rsvg-port,$(GRAPHOBJ),[]ft2demos.opt/opt
|
181
|
182
|
ftmulti_64.exe : $(OBJDIR)ftmulti.obj,$(OBJDIR)common.obj,\
|
182
|
183
|
$(OBJDIR)mlgetopt.obj,$(OBJDIR)ftcommon.obj,$(OBJDIR)strbuf.obj,\
|
183
|
|
- $(GRAPHOBJ)
|
|
184
|
+ $(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
184
|
185
|
link $(LOPTS) $(OBJDIR)ftmulti_64.obj,common_64.obj,mlgetopt_64,ftcommon_64,\
|
185
|
|
- strbuf_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
|
186
|
+ strbuf_64,rsvg-port_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
186
|
187
|
ftview.exe : $(OBJDIR)ftview.obj,$(OBJDIR)common.obj,$(OBJDIR)ftcommon.obj,\
|
187
|
188
|
,$(OBJDIR)mlgetopt.obj,$(OBJDIR)strbuf.obj,$(OBJDIR)ftpngout.obj,\
|
188
|
|
- $(GRAPHOBJ)
|
|
189
|
+ $(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
189
|
190
|
link $(LOPTS) $(OBJDIR)ftview.obj,common.obj,ftcommon.obj,mlgetopt.obj\
|
190
|
|
- ,strbuf,ftpngout,$(GRAPHOBJ),[]ft2demos.opt/opt
|
|
191
|
+ ,strbuf,ftpngout,rsvg-port.obj,$(GRAPHOBJ),[]ft2demos.opt/opt
|
191
|
192
|
ftview_64.exe : $(OBJDIR)ftview.obj,$(OBJDIR)common.obj,$(OBJDIR)ftcommon.obj,\
|
192
|
|
- ,$(OBJDIR)mlgetopt.obj,$(OBJDIR)strbuf.obj,$(OBJDIR)ftpngout.obj,$(GRAPHOBJ)
|
|
193
|
+ ,$(OBJDIR)mlgetopt.obj,$(OBJDIR)strbuf.obj,$(OBJDIR)ftpngout.obj,\
|
|
194
|
+ $(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
193
|
195
|
link $(LOPTS) $(OBJDIR)ftview_64.obj,common_64.obj,ftcommon_64.obj,\
|
194
|
|
- mlgetopt_64.obj,strbuf_64,ftpngout_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
|
196
|
+ mlgetopt_64.obj,strbuf_64,ftpngout_64,rsvg-port_64,$(GRAPHOBJ64),\
|
|
197
|
+ []ft2demos.opt/opt
|
195
|
198
|
ftstring.exe : $(OBJDIR)ftstring.obj,$(OBJDIR)common.obj,\
|
196
|
199
|
$(OBJDIR)ftcommon.obj,$(OBJDIR)mlgetopt.obj,$(OBJDIR)strbuf.obj,\
|
197
|
|
- $(OBJDIR)ftpngout.obj,$(GRAPHOBJ)
|
|
200
|
+ $(OBJDIR)ftpngout.obj,$(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
198
|
201
|
link $(LOPTS) $(OBJDIR)ftstring.obj,common.obj,ftcommon.obj,\
|
199
|
|
- mlgetopt.obj,strbuf,ftpngout,$(GRAPHOBJ),[]ft2demos.opt/opt
|
|
202
|
+ mlgetopt.obj,strbuf,ftpngout,rsvg-port,$(GRAPHOBJ),[]ft2demos.opt/opt
|
200
|
203
|
ftstring_64.exe : $(OBJDIR)ftstring.obj,$(OBJDIR)common.obj,\
|
201
|
204
|
$(OBJDIR)ftcommon.obj,$(OBJDIR)mlgetopt.obj,$(OBJDIR)strbuf.obj,\
|
202
|
|
- $(OBJDIR)ftpngout.obj,$(GRAPHOBJ)
|
|
205
|
+ $(OBJDIR)ftpngout.obj,$(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
203
|
206
|
link $(LOPTS) $(OBJDIR)ftstring_64.obj,common_64.obj,ftcommon_64.obj,\
|
204
|
|
- mlgetopt_64.obj,strbuf_64,ftpngout_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
|
207
|
+ mlgetopt_64.obj,strbuf_64,ftpngout_64,rsvg-port_64,$(GRAPHOBJ64),\
|
|
208
|
+ []ft2demos.opt/opt
|
205
|
209
|
fttimer.exe : $(OBJDIR)fttimer.obj
|
206
|
210
|
link $(LOPTS) $(OBJDIR)fttimer.obj,[]ft2demos.opt/opt
|
207
|
211
|
fttimer_64.exe : $(OBJDIR)fttimer.obj
|
... |
... |
@@ -215,43 +219,47 @@ compos.exe : $(OBJDIR)compos.obj |
215
|
219
|
compos_64.exe : $(OBJDIR)compos.obj
|
216
|
220
|
link $(LOPTS) $(OBJDIR)compos_64.obj,[]ft2demos.opt/opt
|
217
|
221
|
ftdiff.exe : $(OBJDIR)ftdiff.obj $(OBJDIR)ftcommon.obj $(OBJDIR)common.obj\
|
218
|
|
- $(OBJDIR)mlgetopt.obj $(OBJDIR)strbuf.obj $(GRAPHOBJ)
|
|
222
|
+ $(OBJDIR)mlgetopt.obj $(OBJDIR)strbuf.obj,$(OBJDIR)rsvg-port.obj,\
|
|
223
|
+ $(GRAPHOBJ)
|
219
|
224
|
link $(LOPTS) $(OBJDIR)ftdiff.obj,ftcommon.obj,common.obj,mlgetopt.obj\
|
220
|
|
- ,strbuf.obj,$(GRAPHOBJ),[]ft2demos.opt/opt
|
|
225
|
+ ,strbuf.obj,rsvg-port,$(GRAPHOBJ),[]ft2demos.opt/opt
|
221
|
226
|
ftdiff_64.exe : $(OBJDIR)ftdiff.obj $(OBJDIR)ftcommon.obj $(OBJDIR)common.obj\
|
222
|
|
- $(OBJDIR)mlgetopt.obj $(OBJDIR)strbuf.obj $(GRAPHOBJ)
|
|
227
|
+ $(OBJDIR)mlgetopt.obj $(OBJDIR)strbuf.obj,$(OBJDIR)rsvg-port.obj,\
|
|
228
|
+ $(GRAPHOBJ)
|
223
|
229
|
link $(LOPTS) $(OBJDIR)ftdiff_64.obj,ftcommon_64.obj,common_64.obj,\
|
224
|
|
- mlgetopt_64.obj,strbuf_64.obj,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
|
230
|
+ mlgetopt_64.obj,strbuf_64.obj,rsvg-port_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
225
|
231
|
ftgamma.exe : $(OBJDIR)ftgamma.obj $(OBJDIR)ftcommon.obj $(OBJDIR)common.obj\
|
226
|
|
- $(OBJDIR)strbuf.obj $(GRAPHOBJ)
|
227
|
|
- link $(LOPTS) $(OBJDIR)ftgamma.obj,ftcommon,common,strbuf,$(GRAPHOBJ),\
|
228
|
|
- []ft2demos.opt/opt
|
|
232
|
+ $(OBJDIR)strbuf.obj,$(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
|
233
|
+ link $(LOPTS) $(OBJDIR)ftgamma.obj,ftcommon,common,strbuf,rsvg-port,\
|
|
234
|
+ $(GRAPHOBJ),[]ft2demos.opt/opt
|
229
|
235
|
ftgamma_64.exe : $(OBJDIR)ftgamma.obj $(OBJDIR)ftcommon.obj\
|
230
|
|
- $(OBJDIR)common.obj $(OBJDIR)strbuf.obj $(GRAPHOBJ)
|
|
236
|
+ $(OBJDIR)common.obj $(OBJDIR)strbuf.obj,$(OBJDIR)rsvg-port.obj,\
|
|
237
|
+ $(GRAPHOBJ)
|
231
|
238
|
link $(LOPTS) $(OBJDIR)ftgamma_64.obj,ftcommon_64,common_64,strbuf_64,\
|
232
|
|
- $(GRAPHOBJ64),[]ft2demos.opt/opt
|
|
239
|
+ rsvg-port_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
233
|
240
|
ftgrid.exe : $(OBJDIR)ftgrid.obj $(OBJDIR)ftcommon.obj $(OBJDIR)common.obj\
|
234
|
241
|
$(OBJDIR)strbuf.obj $(OBJDIR)output.obj $(OBJDIR)mlgetopt.obj\
|
235
|
|
- $(OBJDIR)ftpngout.obj $(GRAPHOBJ)
|
|
242
|
+ $(OBJDIR)ftpngout.obj,$(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
236
|
243
|
link $(LOPTS) $(OBJDIR)ftgrid.obj,ftcommon,common,strbuf,output,\
|
237
|
|
- mlgetopt,ftpngout,$(GRAPHOBJ),[]ft2demos.opt/opt
|
|
244
|
+ mlgetopt,ftpngout,rsvg-port,$(GRAPHOBJ),[]ft2demos.opt/opt
|
238
|
245
|
ftgrid_64.exe : $(OBJDIR)ftgrid.obj $(OBJDIR)ftcommon.obj $(OBJDIR)common.obj\
|
239
|
246
|
$(OBJDIR)strbuf.obj $(OBJDIR)output.obj $(OBJDIR)mlgetopt.obj\
|
240
|
|
- $(OBJDIR)ftpngout.obj $(GRAPHOBJ)
|
|
247
|
+ $(OBJDIR)ftpngout.obj,$(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
241
|
248
|
link $(LOPTS) $(OBJDIR)ftgrid_64.obj,ftcommon_64,common_64,strbuf_64,\
|
242
|
|
- output_64,mlgetopt_64,ftpngout_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
|
249
|
+ output_64,mlgetopt_64,ftpngout_64,rsvg-port_64,$(GRAPHOBJ64),\
|
|
250
|
+ []ft2demos.opt/opt
|
243
|
251
|
ftpatchk.exe : $(OBJDIR)ftpatchk.obj
|
244
|
252
|
link $(LOPTS) $(OBJDIR)ftpatchk.obj,[]ft2demos.opt/opt
|
245
|
253
|
ftpatchk_64.exe : $(OBJDIR)ftpatchk.obj
|
246
|
254
|
link $(LOPTS) $(OBJDIR)ftpatchk_64.obj,[]ft2demos.opt/opt
|
247
|
255
|
ftsdf.exe : $(OBJDIR)ftsdf.obj $(OBJDIR)ftcommon.obj $(OBJDIR)common.obj\
|
248
|
|
- $(OBJDIR)strbuf.obj $(GRAPHOBJ)
|
249
|
|
- link $(LOPTS) $(OBJDIR)ftsdf.obj,ftcommon,common,strbuf,$(GRAPHOBJ),\
|
250
|
|
- []ft2demos.opt/opt
|
|
256
|
+ $(OBJDIR)strbuf.obj,$(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
|
257
|
+ link $(LOPTS) $(OBJDIR)ftsdf.obj,ftcommon,common,strbuf,rsvg-port,\
|
|
258
|
+ $(GRAPHOBJ),[]ft2demos.opt/opt
|
251
|
259
|
ftsdf_64.exe : $(OBJDIR)ftsdf.obj $(OBJDIR)ftcommon.obj $(OBJDIR)common.obj\
|
252
|
|
- $(OBJDIR)strbuf.obj $(GRAPHOBJ)
|
|
260
|
+ $(OBJDIR)strbuf.obj,$(OBJDIR)rsvg-port.obj,$(GRAPHOBJ)
|
253
|
261
|
link $(LOPTS) $(OBJDIR)ftsdf_64.obj,ftcommon_64,common_64,strbuf_64,\
|
254
|
|
- $(GRAPHOBJ64),[]ft2demos.opt/opt
|
|
262
|
+ rsvg-port_64,$(GRAPHOBJ64),[]ft2demos.opt/opt
|
255
|
263
|
fttry.exe : $(OBJDIR)fttry.obj
|
256
|
264
|
link $(LOPTS) $(OBJDIR)fttry.obj,[]ft2demos.opt/opt
|
257
|
265
|
fttry_64.exe : $(OBJDIR)fttry.obj
|
... |
... |
@@ -268,6 +276,7 @@ $(OBJDIR)ftchkwd.obj : $(SRCDIR)ftchkwd.c |
268
|
276
|
$(OBJDIR)ftlint.obj : $(SRCDIR)ftlint.c
|
269
|
277
|
$(OBJDIR)ftmemchk.obj : $(SRCDIR)ftmemchk.c
|
270
|
278
|
$(OBJDIR)ftdump.obj : $(SRCDIR)ftdump.c
|
|
279
|
+$(OBJDIR)rsvg-port.obj : $(SRCDIR)rsvg-port.c
|
271
|
280
|
$(OBJDIR)testname.obj : $(SRCDIR)testname.c
|
272
|
281
|
$(OBJDIR)ftview.obj : $(SRCDIR)ftview.c
|
273
|
282
|
$(OBJDIR)grobjs.obj : $(GRAPHSRC)grobjs.c
|