Mercurial > hg > xemacs-beta

comparison nt/xemacs.mak @ 4403:7080e020d700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for the Intel compiler under Windows
author Vin Shelton <acs@xemacs.org>
date Thu, 17 Jan 2008 21:02:42 -0500
parents e358b6c40407
children 4b62544f5139
comparison
equal deleted inserted replaced
4402:e70cc8a90e90 4403:7080e020d700
248 # dumping. These are the optimal settings. 248 # dumping. These are the optimal settings.
249 # 249 #
250 # NOTE: The various graphics libraries are generally compiled to use 250 # NOTE: The various graphics libraries are generally compiled to use
251 # MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using 251 # MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using
252 # this is a good thing. 252 # this is a good thing.
253
254 !if $(USE_INTEL_COMPILER)
255 CC=icl
256 INTEL_LIBS=libirc.lib libmmt.lib
257 !endif
253 258
254 !if !defined(USE_SYSTEM_MALLOC) 259 !if !defined(USE_SYSTEM_MALLOC)
255 USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER) 260 USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
256 !endif 261 !endif
257 !if !defined(USE_CRTDLL) 262 !if !defined(USE_CRTDLL)
1288 1293
1289 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc 1294 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc
1290 TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \ 1295 TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \
1291 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ 1296 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
1292 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ 1297 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \
1293 mpr.lib uuid.lib imm32.lib $(LIBC_LIB) 1298 mpr.lib uuid.lib imm32.lib $(INTEL_LIBS) $(LIBC_LIB)
1294 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \ 1299 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
1295 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \ 1300 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \
1296 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj 1301 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj
1297 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \ 1302 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
1298 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map 1303 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map