File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -81,6 +81,13 @@ ifndef STATIC_STDCPLUS
8181STATIC_STDCPLUS =no
8282endif
8383
84+
85+ # Link against the shared version of libwinpthread by default. Set
86+ # STATIC_WINPTHREAD to "yes" to link against static version instead.
87+ ifndef STATIC_WINPTHREAD
88+ STATIC_WINPTHREAD =$(STATIC_STDCPLUS )
89+ endif
90+
8491# If the user doesn't want gettext, undefine it.
8592ifeq (no, $(GETTEXT ) )
8693GETTEXT =
@@ -817,6 +824,10 @@ LIB += -lstdc++
817824endif
818825endif
819826
827+ ifeq (yes, $(STATIC_WINPTHREAD ) )
828+ LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic
829+ endif
830+
820831all : $(TARGET ) vimrun.exe xxd/xxd.exe install.exe uninstal.exe GvimExt/gvimext.dll
821832
822833vimrun.exe : vimrun.c
Original file line number Diff line number Diff line change @@ -764,6 +764,8 @@ static char *(features[]) =
764764
765765static int included_patches [] =
766766{ /* Add new patch number below this line */
767+ /**/
768+ 115 ,
767769/**/
768770 114 ,
769771/**/
You can’t perform that action at this time.
0 commit comments