diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-24 20:36:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-24 20:36:41 +0100 |
| commit | e0874f8cbcddfcf9965a85ba35199964efb1d01a (patch) | |
| tree | 02cba2d1d135a96e3983f0676bb11da770ab0426 /src/Make_cyg_ming.mak | |
| parent | 705ada1aff27ecd9c47c690df817d043c2ceb5e2 (diff) | |
| download | vim-git-e0874f8cbcddfcf9965a85ba35199964efb1d01a.tar.gz | |
patch 7.4.1169v7.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.
Diffstat (limited to 'src/Make_cyg_ming.mak')
| -rw-r--r-- | src/Make_cyg_ming.mak | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 7c7acbd4b..5c7332e1c 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -64,8 +64,10 @@ WINVER = 0x0500 endif # Set to yes to enable Cscope support. CSCOPE=yes -# Set to yes to enable Netbeans support. +# Set to yes to enable Netbeans support (requires CHANNEL). NETBEANS=$(GUI) +# Set to yes to enable inter process communication. +CHANNEL=$(GUI) # Link against the shared version of libstdc++ by default. Set @@ -526,6 +528,10 @@ endif endif endif +ifeq ($(CHANNEL),yes) +DEFINES += -DFEAT_CHANNEL +endif + # DirectWrite (DirectX) ifeq ($(DIRECTX),yes) # Only allow DirectWrite for a GUI build. @@ -667,13 +673,28 @@ endif ifeq ($(CSCOPE),yes) OBJ += $(OUTDIR)/if_cscope.o endif + ifeq ($(NETBEANS),yes) +ifneq ($(CHANNEL),yes) +# Cannot use Netbeans without CHANNEL +NETBEANS=no +else # Only allow NETBEANS for a GUI build. ifeq (yes, $(GUI)) OBJ += $(OUTDIR)/netbeans.o LIB += -lwsock32 endif endif +endif + +ifeq ($(CHANNEL),yes) +OBJ += $(OUTDIR)/channel.o +ifneq ($(NETBEANS),yes) +LIB += -lwsock32 +endif +endif +endif + ifeq ($(DIRECTX),yes) # Only allow DIRECTX for a GUI build. ifeq (yes, $(GUI)) @@ -866,6 +887,9 @@ if_perl.c: if_perl.xs typemap $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC) $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o +$(OUTDIR)/channel.o: channel.c $(INCL) + $(CC) -c $(CFLAGS) channel.c -o $(OUTDIR)/channel.o + $(OUTDIR)/regexp.o: regexp.c regexp_nfa.c $(INCL) $(CC) -c $(CFLAGS) regexp.c -o $(OUTDIR)/regexp.o |