# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 803230165 0
# Node ID 15c642f6c1a1c68ad5ad87867d668c4cd211f578
# Parent  ff7738cdbd999129f3831d706ed32bd51d3f0051
(TRES) [MSVCNT11]: Use emacs.res, and don't compile it.

diff -r ff7738cdbd99 -r 15c642f6c1a1 src/makefile.nt
--- 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