Mercurial > hg > xemacs-beta

comparison nt/xemacs.mak @ 4550:1217f19ce196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge. HG: changed lisp/ChangeLog
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 21 Jan 2008 22:54:43 +0100
parents 4b62544f5139
children dc84ec90b463
comparison
equal deleted inserted replaced
4549:68d1ca56cffa 4550:1217f19ce196
193 DEBUG_XEMACS=0 193 DEBUG_XEMACS=0
194 !endif 194 !endif
195 !if !defined(SUPPORT_EDIT_AND_CONTINUE) 195 !if !defined(SUPPORT_EDIT_AND_CONTINUE)
196 SUPPORT_EDIT_AND_CONTINUE=0 196 SUPPORT_EDIT_AND_CONTINUE=0
197 !endif 197 !endif
198 198 !if !defined(BUILD_FOR_SETUP_KIT)
199 !if !defined(BUILD_FOR_SETUP_KIT) || "$(BUILD_FOR_SETUP_KIT)" == "0" 199 BUILD_FOR_SETUP_KIT=0
200 !endif
201
202 !if !$(BUILD_FOR_SETUP_KIT)
200 OK_TO_USE_MSVCRTD=1 203 OK_TO_USE_MSVCRTD=1
201 !else 204 !else
202 OK_TO_USE_MSVCRTD=0 205 OK_TO_USE_MSVCRTD=0
203 !endif 206 !endif
204 207
654 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC 657 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC
655 !else 658 !else
656 OPT_DEFINES=$(OPT_DEFINES) -DGNU_MALLOC 659 OPT_DEFINES=$(OPT_DEFINES) -DGNU_MALLOC
657 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\free-hook.obj $(OUTDIR)\gmalloc.obj \ 660 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\free-hook.obj $(OUTDIR)\gmalloc.obj \
658 $(OUTDIR)\ntheap.obj $(OUTDIR)\vm-limit.obj 661 $(OUTDIR)\ntheap.obj $(OUTDIR)\vm-limit.obj
662 !endif
663
664 !if $(USE_INTEL_COMPILER)
665 CC=icl
666 # Use static library if possible
667 INTEL_LIBS=libircmt.lib libmmt.lib
668 # Debugging requires DLL version of libm
669 !if $(DEBUG_XEMACS)
670 INTEL_LIBS=libircmt.lib libmmd.lib
671 !endif
659 !endif 672 !endif
660 673
661 ########################### Process options related to compilation. 674 ########################### Process options related to compilation.
662 675
663 # 676 #
1288 1301
1289 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc 1302 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc
1290 TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \ 1303 TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \
1291 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ 1304 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
1292 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ 1305 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \
1293 mpr.lib uuid.lib imm32.lib $(LIBC_LIB) 1306 mpr.lib uuid.lib imm32.lib $(INTEL_LIBS) $(LIBC_LIB)
1294 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \ 1307 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
1295 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \ 1308 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \
1296 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj 1309 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj
1297 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \ 1310 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
1298 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map 1311 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map