Mercurial > emacs

changeset 12240:15c642f6c1a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(TRES) [MSVCNT11]: Use emacs.res, and don't compile it.
author Richard M. Stallman <rms@gnu.org>
date Thu, 15 Jun 1995 15:29:25 +0000
parents ff7738cdbd99
children f92938c6b7c9
files src/makefile.nt
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/makefile.nt	Thu Jun 15 15:29:00 1995 +0000
+++ b/src/makefile.nt	Thu Jun 15 15:29:25 1995 +0000
@@ -36,7 +36,11 @@
 TLIB1           = $(BLD)\temacs1.lib
 TLIB2           = $(BLD)\temacs2.lib
 TOBJ            = $(BLD)\emacs.obj
+!if $(MSVCNT11)
+TRES		= $(BLD)\emacs.res
+!else
 TRES		= $(BLD)\emacs.rbj
+!endif
 
 LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x1000000 -base:0xD00000 -debug:full -debugtype:cv -machine:$(ARCH) -subsystem:console -entry:_start 
 
@@ -161,7 +165,9 @@
 #
 $(TRES):	..\nt\emacs.rc
 		$(RC) -i..\nt -Fo$(BLD)\emacs.res $**
+!if !$(MSVCNT11)
 		$(CVTRES) -r -$(ARCH) -o $@ $(BLD)\emacs.res
+!endif
 
 #
 # Build the library.  Split up the build into two phases...otherwise we