aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2006-12-06 15:31:34 +0000
committerJuanma Barranquero2006-12-06 15:31:34 +0000
commitc388769ecec3099dba9f7c9027757fdf90a357cc (patch)
tree79b6208505df35409d383b6d00079506864c9fcc
parent04b61ae98d945468c2c1c0c4797abf9f08fdc8b9 (diff)
downloademacs-c388769ecec3099dba9f7c9027757fdf90a357cc.tar.gz
emacs-c388769ecec3099dba9f7c9027757fdf90a357cc.zip
($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe): Use $(USER32)
for compatibility with Visual Studio .NET 2003.
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/makefile.w32-in4
2 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 8de03606271..133a1e15f03 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12006-12-06 Christoph Conrad <christoph.conrad@gmx.de> (tiny change)
2
3 * makefile.w32-in ($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe):
4 Use $(USER32) for compatibility with Visual Studio .NET 2003.
5
12006-11-30 Juanma Barranquero <lekktu@gmail.com> 62006-11-30 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * emacsclient.c (emacs_pid): New variable. 8 * emacsclient.c (emacs_pid): New variable.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 7f3fc12ac1e..01c2aa0df62 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -82,11 +82,11 @@ $(TRES): ../nt/emacs.rc
82 82
83$(BLD)/emacsclient.exe: $(ECLIENTOBJS) 83$(BLD)/emacsclient.exe: $(ECLIENTOBJS)
84# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 84# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
85 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS) 85 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
86 86
87$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES) 87$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES)
88# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 88# 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) $(LIBS) 89 $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
90 90
91# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in 91# 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. 92# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.