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

updated for version 7.3.821

Browse Source 
Problem:    Build with OLE and Cygwin is broken. (Steve Hall)
Solution:   Select static or shared stdc library. (Ken Takta)
This commit is contained in:
Bram Moolenaar
2013-02-16 18:16:15 +01:00
parent feeaa688eb
commit 5004e8846e
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Make_cyg.mak
View File

@@ -106,6 +106,13 @@ ifndef OPTIMIZE
OPTIMIZE = MAXSPEED OPTIMIZE = MAXSPEED
endif endif
# Link against the shared version of libstdc++ by default. Set
# STATIC_STDCPLUS to "yes" to link against static version instead.
ifndef STATIC_STDCPLUS
STATIC_STDCPLUS=no
endif
### See feature.h for a list of optionals. ### See feature.h for a list of optionals.
### Any other defines can be included here. ### Any other defines can be included here.
@@ -478,7 +485,12 @@ endif
ifeq (yes, $(OLE)) ifeq (yes, $(OLE))
DEFINES += -DFEAT_OLE DEFINES += -DFEAT_OLE
EXTRA_OBJS += $(OUTDIR)/if_ole.o EXTRA_OBJS += $(OUTDIR)/if_ole.o
EXTRA_LIBS += -loleaut32 -lstdc++ EXTRA_LIBS += -loleaut32
ifeq (yes, $(STATIC_STDCPLUS))
EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic
else
EXTRA_LIBS += -lstdc++
endif
endif endif
############################## ##############################

2
src/version.c
View File

@@ -725,6 +725,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 */
/**/
821,
/**/ /**/
820, 820,
/**/ /**/