[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lib-src/makefile.w32-in,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lib-src/makefile.w32-in,v |
Date: |
Mon, 27 Nov 2006 15:59:20 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 06/11/27 15:59:19
Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/makefile.w32-in,v
retrieving revision 2.52
retrieving revision 2.53
diff -u -b -r2.52 -r2.53
--- makefile.w32-in 27 Nov 2006 07:02:19 -0000 2.52
+++ makefile.w32-in 27 Nov 2006 15:59:19 -0000 2.53
@@ -75,14 +75,18 @@
$(BLD)/getopt.$(O) \
$(BLD)/getopt1.$(O) \
$(BLD)/ntlib.$(O)
+TRES = ../nt/$(BLD)/emacs.res
+
+$(TRES): ../nt/emacs.rc
+ $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
$(BLD)/emacsclient.exe: $(ECLIENTOBJS)
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32)
$(LIBS)
-$(BLD)/emacsclientw.exe: $(ECLIENTOBJS)
+$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES)
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
- $(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS)
$(WSOCK32) $(LIBS)
+ $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS)
$(ECLIENTOBJS) $(WSOCK32) $(LIBS)
# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.