patch 7.4.1083
Problem: Building GvimExt with VS2015 may fail.
Solution: Adjust the makefile. (Mike Williams)
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile
index 16b1734..b451981 100644
--- a/src/GvimExt/Makefile
+++ b/src/GvimExt/Makefile
@@ -12,6 +12,22 @@
NODEBUG = 1
!endif
+!ifdef PROCESSOR_ARCHITECTURE
+# On Windows NT
+! ifndef CPU
+CPU = i386
+! ifdef PLATFORM
+! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
+CPU = AMD64
+! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86")
+! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted.
+! endif
+! endif
+! endif
+!else
+CPU = i386
+!endif
+
!ifdef SDK_INCLUDE_DIR
!include $(SDK_INCLUDE_DIR)\Win32.mak
!else
@@ -30,15 +46,15 @@
gvimext.obj: gvimext.h
.cpp.obj:
- $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
+ $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
gvimext.res: gvimext.rc
- $(rc) $(rcflags) $(rcvars) gvimext.rc
+ $(rc) $(rcflags) $(rcvars) gvimext.rc
clean:
- - if exist gvimext.dll del gvimext.dll
- - if exist gvimext.lib del gvimext.lib
- - if exist gvimext.exp del gvimext.exp
- - if exist gvimext.obj del gvimext.obj
- - if exist gvimext.res del gvimext.res
- - if exist gvimext.dll.manifest del gvimext.dll.manifest
+ - if exist gvimext.dll del gvimext.dll
+ - if exist gvimext.lib del gvimext.lib
+ - if exist gvimext.exp del gvimext.exp
+ - if exist gvimext.obj del gvimext.obj
+ - if exist gvimext.res del gvimext.res
+ - if exist gvimext.dll.manifest del gvimext.dll.manifest
diff --git a/src/version.c b/src/version.c
index f1e2b05..b0a3a93 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1083,
+/**/
1082,
/**/
1081,