Mercurial > vim

comparison src/Make_cyg_ming.mak @ 7743:6069f43cea4e v7.4.1169

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/e0874f8cbcddfcf9965a85ba35199964efb1d01a Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 24 20:36:41 2016 +0100 patch 7.4.1169 Problem: The socket I/O is intertwined with the netbeans code. Solution: Start refactoring the netbeans communication to split off the socket I/O. Add the +channel feature.
author Christian Brabandt <cb@256bit.org>
date Sun, 24 Jan 2016 20:45:05 +0100
parents bce3b5ddb393
children b21c2a9dcd7d
comparison
equal deleted inserted replaced
7742:5f6f35a3cb12 7743:6069f43cea4e
62 ifndef WINVER 62 ifndef WINVER
63 WINVER = 0x0500 63 WINVER = 0x0500
64 endif 64 endif
65 # Set to yes to enable Cscope support. 65 # Set to yes to enable Cscope support.
66 CSCOPE=yes 66 CSCOPE=yes
67 # Set to yes to enable Netbeans support. 67 # Set to yes to enable Netbeans support (requires CHANNEL).
68 NETBEANS=$(GUI) 68 NETBEANS=$(GUI)
69 # Set to yes to enable inter process communication.
70 CHANNEL=$(GUI)
69 71
70 72
71 # Link against the shared version of libstdc++ by default. Set 73 # Link against the shared version of libstdc++ by default. Set
72 # STATIC_STDCPLUS to "yes" to link against static version instead. 74 # STATIC_STDCPLUS to "yes" to link against static version instead.
73 ifndef STATIC_STDCPLUS 75 ifndef STATIC_STDCPLUS
522 DEFINES += -DNBDEBUG 524 DEFINES += -DNBDEBUG
523 NBDEBUG_INCL = nbdebug.h 525 NBDEBUG_INCL = nbdebug.h
524 NBDEBUG_SRC = nbdebug.c 526 NBDEBUG_SRC = nbdebug.c
525 endif 527 endif
526 endif 528 endif
529 endif
530
531 ifeq ($(CHANNEL),yes)
532 DEFINES += -DFEAT_CHANNEL
527 endif 533 endif
528 534
529 # DirectWrite (DirectX) 535 # DirectWrite (DirectX)
530 ifeq ($(DIRECTX),yes) 536 ifeq ($(DIRECTX),yes)
531 # Only allow DirectWrite for a GUI build. 537 # Only allow DirectWrite for a GUI build.
665 OBJ += $(OUTDIR)/if_tcl.o 671 OBJ += $(OUTDIR)/if_tcl.o
666 endif 672 endif
667 ifeq ($(CSCOPE),yes) 673 ifeq ($(CSCOPE),yes)
668 OBJ += $(OUTDIR)/if_cscope.o 674 OBJ += $(OUTDIR)/if_cscope.o
669 endif 675 endif
676
670 ifeq ($(NETBEANS),yes) 677 ifeq ($(NETBEANS),yes)
678 ifneq ($(CHANNEL),yes)
679 # Cannot use Netbeans without CHANNEL
680 NETBEANS=no
681 else
671 # Only allow NETBEANS for a GUI build. 682 # Only allow NETBEANS for a GUI build.
672 ifeq (yes, $(GUI)) 683 ifeq (yes, $(GUI))
673 OBJ += $(OUTDIR)/netbeans.o 684 OBJ += $(OUTDIR)/netbeans.o
674 LIB += -lwsock32 685 LIB += -lwsock32
675 endif 686 endif
676 endif 687 endif
688 endif
689
690 ifeq ($(CHANNEL),yes)
691 OBJ += $(OUTDIR)/channel.o
692 ifneq ($(NETBEANS),yes)
693 LIB += -lwsock32
694 endif
695 endif
696 endif
697
677 ifeq ($(DIRECTX),yes) 698 ifeq ($(DIRECTX),yes)
678 # Only allow DIRECTX for a GUI build. 699 # Only allow DIRECTX for a GUI build.
679 ifeq (yes, $(GUI)) 700 ifeq (yes, $(GUI))
680 OBJ += $(OUTDIR)/gui_dwrite.o 701 OBJ += $(OUTDIR)/gui_dwrite.o
681 LIB += -ld2d1 -ldwrite 702 LIB += -ld2d1 -ldwrite
863 $(XSUBPP) -prototypes -typemap \ 884 $(XSUBPP) -prototypes -typemap \
864 $(PERLTYPEMAP) if_perl.xs > $@ 885 $(PERLTYPEMAP) if_perl.xs > $@
865 886
866 $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC) 887 $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
867 $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o 888 $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
889
890 $(OUTDIR)/channel.o: channel.c $(INCL)
891 $(CC) -c $(CFLAGS) channel.c -o $(OUTDIR)/channel.o
868 892
869 $(OUTDIR)/regexp.o: regexp.c regexp_nfa.c $(INCL) 893 $(OUTDIR)/regexp.o: regexp.c regexp_nfa.c $(INCL)
870 $(CC) -c $(CFLAGS) regexp.c -o $(OUTDIR)/regexp.o 894 $(CC) -c $(CFLAGS) regexp.c -o $(OUTDIR)/regexp.o
871 895
872 $(OUTDIR)/if_mzsch.o: if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP) 896 $(OUTDIR)/if_mzsch.o: if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)