Since, with this new set of conditionals, netbeans is never built without channel, why not leave winsock32 out of the netbeans block and make it unconditional in the channel block? Wouldn't that be logically equivalent but clearer?
Best regards, Tony. On Sun, Feb 14, 2016 at 11:11 PM, Bram Moolenaar <[email protected]> wrote: > > Yasuhiro Matsumoto wrote: > >> When set CHANNEL=yes for make, libwsock32.a should be linked on windows. >> >> diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak >> index 026c966..4bca8be 100644 >> --- a/src/Make_cyg_ming.mak >> +++ b/src/Make_cyg_ming.mak >> @@ -689,10 +689,8 @@ endif >> >> ifeq ($(CHANNEL),yes) >> OBJ += $(OUTDIR)/channel.o >> -ifneq ($(NETBEANS),yes) >> LIB += -lwsock32 >> endif >> -endif >> >> ifeq ($(DIRECTX),yes) >> # Only allow DIRECTX for a GUI build. > > Hmm, but then it gets added twice when using Netbeans and the GUI. > I think we should make it a bit more consistent: > > ifeq ($(NETBEANS),yes) > ifneq ($(CHANNEL),yes) > # Cannot use Netbeans without CHANNEL > NETBEANS=no > else > ifneq (yes, $(GUI)) > # Cannot use Netbeans without GUI. > NETBEANS=no > else > OBJ += $(OUTDIR)/netbeans.o > LIB += -lwsock32 > endif > endif > endif > > ifeq ($(CHANNEL),yes) > OBJ += $(OUTDIR)/channel.o > ifneq ($(NETBEANS),yes) > LIB += -lwsock32 > endif > endif > > Does that work? > > -- > hundred-and-one symptoms of being an internet addict: > 256. You are able to write down over 250 symptoms of being an internet > addict, even though they only asked for 101. > > /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ > /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ > \\\ an exciting new programming language -- http://www.Zimbu.org /// > \\\ help me help AIDS victims -- http://ICCF-Holland.org /// > > -- > -- > You received this message from the "vim_dev" maillist. > Do not top-post! Type your reply below the text you are replying to. > For more information, visit http://www.vim.org/maillist.php > > --- > You received this message because you are subscribed to the Google Groups > "vim_dev" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/d/optout. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
