Mercurial > emacs
comparison lib-src/makefile.w32-in @ 85114:5039706521c9
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 09 Oct 2007 08:52:57 +0000 |
| parents | c213188a0b55 e7e6abb88c1c |
| children | 7b07f791ed62 bdb3fe0ba9fa |
comparison
equal
deleted
inserted
replaced
| 85113:82b4a12fd080 | 85114:5039706521c9 |
|---|---|
| 80 $(TRES): ../nt/emacs.rc | 80 $(TRES): ../nt/emacs.rc |
| 81 $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS) | 81 $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS) |
| 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) $(USER32) $(LIBS) | 85 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(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) $(USER32) $(LIBS) | 89 $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(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. |
| 93 $(BLD)/emacsclient.$(O): emacsclient.c makefile.w32-in | 93 $(BLD)/emacsclient.$(O): emacsclient.c makefile.w32-in |
| 94 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c | 94 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c |