changeset: 4403:7080e020d70021a200ac537c0c58a6c210135934 tag: tip user: Vin Shelton <acs(a)xemacs.org&gt; date: Thu Jan 17 21:02:42 2008 -0500 files: nt/ChangeLog nt/config.inc.samp nt/xemacs.mak description: Add support for the Intel compiler under Windows diff -r e70cc8a90e9043075a0e40fe9587d2c931fb618e -r 7080e020d70021a200ac537c0c58a6c210135934 nt/ChangeLog --- a/nt/ChangeLog Thu Jan 17 11:55:11 2008 +0100 +++ b/nt/ChangeLog Thu Jan 17 21:02:42 2008 -0500 ＠＠ -1,3 +1,9 ＠＠ 2007-10-15 Adrian Aichner <adrian＠xema +2008-01-17 Vin Shelton <acs(a)xemacs.org&gt; + + * config.inc.samp: Added USE_INTEL_COMPILER to support the Intel + compiler. + * xemacs.mak: Use USE_INTEL_COMPILER. + 2007-10-15 Adrian Aichner <adrian(a)xemacs.org&gt; * xemacs.mak (INFO_FILES): Sync nt/xemacs.mak and man/Makefile diff -r e70cc8a90e9043075a0e40fe9587d2c931fb618e -r 7080e020d70021a200ac537c0c58a6c210135934 nt/config.inc.samp --- a/nt/config.inc.samp Thu Jan 17 11:55:11 2008 +0100 +++ b/nt/config.inc.samp Thu Jan 17 21:02:42 2008 -0500 ＠＠ -257,3 +257,6 ＠＠ NEW_GC=0 # *AND CURRENTLY HAPPENS WITH VC++*, at least when using pdump. Therefore, # be warned! USE_UNION_TYPE=0 + +# Set this to build XEmacs with the Intel C Compiler. +USE_INTEL_COMPILER=0 diff -r e70cc8a90e9043075a0e40fe9587d2c931fb618e -r 7080e020d70021a200ac537c0c58a6c210135934 nt/xemacs.mak --- a/nt/xemacs.mak Thu Jan 17 11:55:11 2008 +0100 +++ b/nt/xemacs.mak Thu Jan 17 21:02:42 2008 -0500 ＠＠ -250,6 +250,11 ＠＠ 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) ＠＠ -1290,7 +1295,7 ＠＠ TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \ TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \ oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ - mpr.lib uuid.lib imm32.lib $(LIBC_LIB) + mpr.lib uuid.lib imm32.lib $(INTEL_LIBS) $(LIBC_LIB) TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \ -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \ -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches