Mercurial > hg > xemacs-beta

changeset 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 80e07b006f9c
children 5998e37dc35e
files nt/ChangeLog nt/xemacs.mak
diffstat 2 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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-18  Vin Shelton  <acs@xemacs.org>
+
+	* xemacs.mak: Use debug version of Intel's libm, if appropriate.
+
 2008-01-17  Vin Shelton  <acs@xemacs.org>
 
 	* config.inc.samp: Added USE_INTEL_COMPILER to support the Intel
--- 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 @@
 !if !defined(SUPPORT_EDIT_AND_CONTINUE)
 SUPPORT_EDIT_AND_CONTINUE=0
 !endif
+!if !defined(BUILD_FOR_SETUP_KIT)
+BUILD_FOR_SETUP_KIT=0
+!endif
 
-!if !defined(BUILD_FOR_SETUP_KIT) || "$(BUILD_FOR_SETUP_KIT)" == "0"
+!if !$(BUILD_FOR_SETUP_KIT)
 OK_TO_USE_MSVCRTD=1
 !else
 OK_TO_USE_MSVCRTD=0
@@ -251,11 +254,6 @@
 # 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)
 !endif
@@ -663,6 +661,16 @@
 	$(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.
 
 #