carbon2-commit: Use debug version of Intel's math library when debugging.

changeset: 4420:4b62544f513970f4d9a12c1723dc145bfe6cde84 user: Vin Shelton <acs(a)xemacs.org&gt; date: Fri Jan 18 22:06:01 2008 -0500 files: nt/ChangeLog nt/xemacs.mak description: Use debug version of Intel's math library when debugging. diff -r 80e07b006f9c32715be50f894640af03293ae544 -r 4b62544f513970f4d9a12c1723dc145bfe6cde84 nt/ChangeLog --- a/nt/ChangeLog Fri Jan 18 16:12:31 2008 -0700 +++ b/nt/ChangeLog Fri Jan 18 22:06:01 2008 -0500 ＠＠ -1,3 +1,7 ＠＠ 2008-01-17 Vin Shelton <acs(a)xemacs.org +2008-01-18 Vin Shelton <acs(a)xemacs.org&gt; + + * xemacs.mak: Use debug version of Intel's libm, if appropriate. + 2008-01-17 Vin Shelton <acs(a)xemacs.org&gt; * config.inc.samp: Added USE_INTEL_COMPILER to support the Intel diff -r 80e07b006f9c32715be50f894640af03293ae544 -r 4b62544f513970f4d9a12c1723dc145bfe6cde84 nt/xemacs.mak --- a/nt/xemacs.mak Fri Jan 18 16:12:31 2008 -0700 +++ b/nt/xemacs.mak Fri Jan 18 22:06:01 2008 -0500 ＠＠ -195,8 +195,11 ＠＠ DEBUG_XEMACS=0 !if !defined(SUPPORT_EDIT_AND_CONTINUE) SUPPORT_EDIT_AND_CONTINUE=0 !endif - -!if !defined(BUILD_FOR_SETUP_KIT) || "$(BUILD_FOR_SETUP_KIT)" == "0" +!if !defined(BUILD_FOR_SETUP_KIT) +BUILD_FOR_SETUP_KIT=0 +!endif + +!if !$(BUILD_FOR_SETUP_KIT) OK_TO_USE_MSVCRTD=1 !else OK_TO_USE_MSVCRTD=0 ＠＠ -250,11 +253,6 ＠＠ USE_MINITAR=$(HAVE_ZLIB) # NOTE: The various graphics libraries are generally compiled to use # MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using # this is a good thing. - -!if $(USE_INTEL_COMPILER) -CC=icl -INTEL_LIBS=libirc.lib libmmt.lib -!endif !if !defined(USE_SYSTEM_MALLOC) USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER) ＠＠ -661,6 +659,16 ＠＠ OPT_DEFINES=$(OPT_DEFINES) -DGNU_MALLOC OPT_DEFINES=$(OPT_DEFINES) -DGNU_MALLOC OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\free-hook.obj $(OUTDIR)\gmalloc.obj \ $(OUTDIR)\ntheap.obj $(OUTDIR)\vm-limit.obj +!endif + +!if $(USE_INTEL_COMPILER) +CC=icl +# Use static library if possible +INTEL_LIBS=libircmt.lib libmmt.lib +# Debugging requires DLL version of libm +!if $(DEBUG_XEMACS) +INTEL_LIBS=libircmt.lib libmmd.lib +!endif !endif ########################### Process options related to compilation. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches