aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src/makefile.w32-in
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src/makefile.w32-in')
-rw-r--r--lib-src/makefile.w32-in11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 02f877581c8..e61bbca2a74 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -75,18 +75,19 @@ ECLIENTOBJS = $(BLD)/emacsclient.$(O) \
75 $(BLD)/getopt.$(O) \ 75 $(BLD)/getopt.$(O) \
76 $(BLD)/getopt1.$(O) \ 76 $(BLD)/getopt1.$(O) \
77 $(BLD)/ntlib.$(O) 77 $(BLD)/ntlib.$(O)
78TRES = ../nt/$(BLD)/emacs.res 78CLIENTRES = ../nt/$(BLD)/emacsclient.res
79 79
80$(TRES): ../nt/emacs.rc 80$(CLIENTRES): ../nt/emacsclient.rc
81 $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS) 81 @echo Emacsclient resource file must be built from nt directory
82 @exit -1
82 83
83$(BLD)/emacsclient.exe: $(ECLIENTOBJS) 84$(BLD)/emacsclient.exe: $(ECLIENTOBJS)
84# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 85# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
85 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) 86 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
86 87
87$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES) 88$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES)
88# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 89# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
89 $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) 90 $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
90 91
91# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in 92# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
92# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS. 93# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.