thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1326

Browse Source 
Problem:    Build rules are bit too complicated.
Solution:   Remove -lwsock32 from Netbeans, it's already added for the channel
            feature that it depends on. (Tony Mechelynck)
This commit is contained in:
Bram Moolenaar
2016-02-15 22:45:12 +01:00
parent 2368917d8f
commit 97eba78f69
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Make_cyg_ming.mak
View File

@@ -684,17 +684,14 @@ ifneq (yes, $(GUI))
NETBEANS=no NETBEANS=no
else else
OBJ += $(OUTDIR)/netbeans.o OBJ += $(OUTDIR)/netbeans.o
LIB += -lwsock32
endif endif
endif endif
endif endif
ifeq ($(CHANNEL),yes) ifeq ($(CHANNEL),yes)
OBJ += $(OUTDIR)/channel.o OBJ += $(OUTDIR)/channel.o
ifneq ($(NETBEANS),yes)
LIB += -lwsock32 LIB += -lwsock32
endif endif
endif
ifeq ($(DIRECTX),yes) ifeq ($(DIRECTX),yes)
# Only allow DIRECTX for a GUI build. # Only allow DIRECTX for a GUI build.

2
src/version.c
View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1326,
/**/ /**/
1325, 1325,
/**/ /**/