From 070d8109321f6e8436784e08eb46188420d11996 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 15 Jun 1995 15:29:25 +0000 Subject: [PATCH] (TRES) [MSVCNT11]: Use emacs.res, and don't compile it. --- src/makefile.nt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/makefile.nt b/src/makefile.nt index f8d841920b8..d7118391c12 100644 --- a/src/makefile.nt +++ b/src/makefile.nt @@ -36,7 +36,11 @@ TEMACS = $(BLD)\temacs.exe 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 @@ $(TEMACS): $(TLIB1) $(TLIB2) $(TOBJ) $(TRES) # $(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 -- 2.39.2