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 16b17345d8f19a7aa0c7e99bb97cc8270826ce3e..b451981448abfba1b5f9e9a0dca30dc75e285230 100644 (file)
--- a/src/GvimExt/Makefile
+++ b/src/GvimExt/Makefile
@@ -12,6 +12,22 @@ APPVER=5.0
 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.dll:    gvimext.obj \
 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 f1e2b05b5cb55782d64c5f24c48fa59a8cb159a5..b0a3a938f2b5d1a81871283c80874fe427896f30 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1083,
 /**/
     1082,
 /**/