comparison nt/xemacs.mak @ 3263:d674024a8674

[xemacs-hg @ 2006-02-27 16:29:00 by crestani] - Introduce a fancy asynchronous finalization strategy on C level. - Merge the code conditioned on MC_ALLOC into the code conditioned on NEW_GC. - Remove the possibility to free objects manually outside garbage collections when the new collector is enabled.
author crestani
date Mon, 27 Feb 2006 16:29:29 +0000
parents 141c2920ea48
children 57711e9aac15
comparison
equal deleted inserted replaced
3262:79d41cfd8e6b 3263:d674024a8674
213 !endif 213 !endif
214 214
215 !if !defined(USE_KKCC) 215 !if !defined(USE_KKCC)
216 USE_KKCC=0 216 USE_KKCC=0
217 !endif 217 !endif
218 !if !defined(MC_ALLOC)
219 MC_ALLOC=0
220 !endif
221 !if !defined(NEW_GC) 218 !if !defined(NEW_GC)
222 NEW_GC=0 219 NEW_GC=0
223 !endif 220 !endif
224 !if !defined(USE_UNION_TYPE) 221 !if !defined(USE_UNION_TYPE)
225 USE_UNION_TYPE=0 222 USE_UNION_TYPE=0
642 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\unexnt.obj 639 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\unexnt.obj
643 !endif 640 !endif
644 641
645 !if $(NEW_GC) 642 !if $(NEW_GC)
646 OPT_DEFINES=$(OPT_DEFINES) -DNEW_GC 643 OPT_DEFINES=$(OPT_DEFINES) -DNEW_GC
647 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\vdb.obj $(OUTDIR)\vdb-win32.obj 644 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\vdb.obj $(OUTDIR)\vdb-win32.obj \
645 $(OUTDIR)\mc-alloc.obj
648 USE_KKCC=1 646 USE_KKCC=1
649 MC_ALLOC=1
650 !endif 647 !endif
651 648
652 !if $(USE_KKCC) 649 !if $(USE_KKCC)
653 OPT_DEFINES=$(OPT_DEFINES) -DUSE_KKCC 650 OPT_DEFINES=$(OPT_DEFINES) -DUSE_KKCC
654 !endif
655
656 !if $(MC_ALLOC)
657 OPT_DEFINES=$(OPT_DEFINES) -DMC_ALLOC
658 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\mc-alloc.obj
659 !endif 651 !endif
660 652
661 !if $(USE_SYSTEM_MALLOC) 653 !if $(USE_SYSTEM_MALLOC)
662 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC 654 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC
663 !else 655 !else
1264 !endif 1256 !endif
1265 !if $(QUICK_BUILD) 1257 !if $(QUICK_BUILD)
1266 Disabling non-essential build actions. Use with care! 1258 Disabling non-essential build actions. Use with care!
1267 !endif 1259 !endif
1268 !if $(USE_KKCC) 1260 !if $(USE_KKCC)
1269 Using new experimental GC algorithms. 1261 Using new experimental GC mark algorithms.
1270 !endif
1271 !if $(MC_ALLOC)
1272 Using new experimental allocator.
1273 !endif 1262 !endif
1274 !if $(NEW_GC) 1263 !if $(NEW_GC)
1275 Using new experimental incremental garbage collector. 1264 Using new experimental incremental garbage collector and new allocator.
1276 !endif 1265 !endif
1277 <<NOKEEP 1266 <<NOKEEP
1278 @echo -------------------------------------------------------------------- 1267 @echo --------------------------------------------------------------------
1279 @type $(BLDROOT)\Installation 1268 @type $(BLDROOT)\Installation
1280 @echo -------------------------------------------------------------------- 1269 @echo --------------------------------------------------------------------