The 21.4 version of the Intel compiler patch.
nt/ChangeLog addition:
2008-01-18 Vin Shelton <acs(a)xemacs.org>
* xemacs.mak: Support Intel C compiler.
* config.inc.samp: ditto.
21.4 source patch:
Diff command: cvs -q diff -u
Files affected: nt/config.inc.samp nt/xemacs.mak
Index: nt/xemacs.mak
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.58.2.13
diff -a -u -u -r1.58.2.13 xemacs.mak
--- nt/xemacs.mak 2006/03/18 19:26:32 1.58.2.13
+++ nt/xemacs.mak 2008/01/19 16:47:18
@@ -353,6 +353,16 @@
! endif
!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
+
#
# Compiler command echo control. Define VERBOSECC=1 to get verbose compilation.
#
@@ -872,7 +882,8 @@
TEMACS_SRC=$(SRC)
TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \
oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
- shell32.lib wsock32.lib winmm.lib winspool.lib ole32.lib uuid.lib $(LIBC_LIB)
+ shell32.lib wsock32.lib winmm.lib winspool.lib ole32.lib uuid.lib \
+ $(INTEL_LIBS) $(LIBC_LIB)
TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\
-stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows\
-pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \
Index: nt/config.inc.samp
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/config.inc.samp,v
retrieving revision 1.2.2.5
diff -a -u -u -r1.2.2.5 config.inc.samp
--- nt/config.inc.samp 2006/03/18 19:26:32 1.2.2.5
+++ nt/config.inc.samp 2008/01/19 16:47:18
@@ -98,3 +98,5 @@
# routines, instead of the older "unexec" routines in unexnt.c.
USE_PORTABLE_DUMPER=1
+# Set this to build XEmacs with the Intel C Compiler.
+USE_INTEL_COMPILER=0
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches