From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 15 Jan 2016 17:03:32 +0000 (+0100)
Subject: patch 7.4.1095
X-Git-Tag: v7.4.1095
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d6d5cc3a417c04d9772596ea83f8e6b41321781;p=thirdparty%2Fvim.git

patch 7.4.1095
Problem:    Can't build GvimExt with SDK 7.1.
Solution:   Support using setenv.bat instead of vcvars32.bat. (Ken Takata)
---

diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile
index b451981448..a57840fa1f 100644
--- a/src/GvimExt/Makefile
+++ b/src/GvimExt/Makefile
@@ -16,6 +16,9 @@ NODEBUG = 1
 # On Windows NT
 ! ifndef CPU
 CPU = i386
+!  if !defined(PLATFORM) && defined(TARGET_CPU)
+PLATFORM = $(TARGET_CPU)
+!  endif
 !  ifdef PLATFORM
 !   if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
 CPU = AMD64
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index f51fbfcde4..6f0b84391c 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -216,6 +216,9 @@ CPU = i386
 !  endif
 ! else  # !CPU
 CPU = i386
+!  if !defined(PLATFORM) && defined(TARGET_CPU)
+PLATFORM = $(TARGET_CPU)
+!  endif
 !  ifdef PLATFORM
 !   if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
 CPU = AMD64
diff --git a/src/version.c b/src/version.c
index e0d94fda3f..2c92c175fc 100644
--- 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 */
+/**/
+    1095,
 /**/
     1094,
 /**/