patch 7.4.1095

Problem: Can't build GvimExt with SDK 7.1. Solution: Support using setenv.bat instead of vcvars32.bat. (Ken Takata)
vim · Jan 15, 2016 · 3d6d5cc · 3d6d5cc
1 parent 5a46a58
commit 3d6d5cc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1095,
 /**/
     1094,
 /**/