Mercurial > hg > xemacs-beta

comparison nt/xemacs.mak @ 4405:4b62544f5139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use debug version of Intel's math library when debugging.
author Vin Shelton <acs@xemacs.org>
date Fri, 18 Jan 2008 22:06:01 -0500
parents 7080e020d700
children dc84ec90b463
comparison
equal deleted inserted replaced
4404:80e07b006f9c 4405:4b62544f5139
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
248 # dumping. These are the optimal settings. 251 # dumping. These are the optimal settings.
249 # 252 #
250 # NOTE: The various graphics libraries are generally compiled to use 253 # NOTE: The various graphics libraries are generally compiled to use
251 # MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using 254 # MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using
252 # this is a good thing. 255 # this is a good thing.
253
254 !if $(USE_INTEL_COMPILER)
255 CC=icl
256 INTEL_LIBS=libirc.lib libmmt.lib
257 !endif
258 256
259 !if !defined(USE_SYSTEM_MALLOC) 257 !if !defined(USE_SYSTEM_MALLOC)
260 USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER) 258 USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
261 !endif 259 !endif
262 !if !defined(USE_CRTDLL) 260 !if !defined(USE_CRTDLL)
659 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC 657 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC
660 !else 658 !else
661 OPT_DEFINES=$(OPT_DEFINES) -DGNU_MALLOC 659 OPT_DEFINES=$(OPT_DEFINES) -DGNU_MALLOC
662 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\free-hook.obj $(OUTDIR)\gmalloc.obj \ 660 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\free-hook.obj $(OUTDIR)\gmalloc.obj \
663 $(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
664 !endif 672 !endif
665 673
666 ########################### Process options related to compilation. 674 ########################### Process options related to compilation.
667 675
668 # 676 #