Commit 4d91c8f9 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(TRES): New macro (copied from nt/makefile.w32-in).

($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.
parent 98198c4f
2006-11-27 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (TRES): New macro (copied from nt/makefile.w32-in).
($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.
2006-11-27 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on
......
......@@ -75,14 +75,18 @@ ECLIENTOBJS = $(BLD)/emacsclient.$(O) \
$(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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment