# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1452878105 -3600
# Node ID 4447dc38bc2205e76bc5a98f80a0b5f98fff7d55
# Parent  4d9814f9fc39fb54374196100b204f26cf39e8fe
commit https://github.com/vim/vim/commit/3d6d5cc3a417c04d9772596ea83f8e6b41321781
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jan 15 18:03:32 2016 +0100

    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
--- 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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1095,
+/**/
     1094,
 /**/
     1093,