Mercurial > hg > xemacs-beta
changeset 4403:7080e020d700
Add support for the Intel compiler under Windows
| author | Vin Shelton <acs@xemacs.org> |
|---|---|
| date | Thu, 17 Jan 2008 21:02:42 -0500 |
| parents | e70cc8a90e90 |
| children | 80e07b006f9c |
| files | nt/ChangeLog nt/config.inc.samp nt/xemacs.mak |
| diffstat | 3 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ +2008-01-17 Vin Shelton <acs@xemacs.org> + + * config.inc.samp: Added USE_INTEL_COMPILER to support the Intel + compiler. + * xemacs.mak: Use USE_INTEL_COMPILER. + 2007-10-15 Adrian Aichner <adrian@xemacs.org> * xemacs.mak (INFO_FILES): Sync nt/xemacs.mak and man/Makefile
--- 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 @@ # *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
--- a/nt/xemacs.mak Thu Jan 17 11:55:11 2008 +0100 +++ b/nt/xemacs.mak Thu Jan 17 21:02:42 2008 -0500 @@ -251,6 +251,11 @@ # 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 @@ -1290,7 +1295,7 @@ 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