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 b451981448abfba1b5f9e9a0dca30dc75e285230..a57840fa1f77dd70429bd3ad2be9a2bd1ce8db74 100644 (file)
--- 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 f51fbfcde469944a1ffb339b57a9d6ce58b20518..6f0b84391c4352d18f048e07089461b74f20efcb 100644 (file)
--- 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 e0d94fda3fa30942ccb8a71846aa1c8a76aa5291..2c92c175fcb551f741785e5e58043f7fc37d322e 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 */
+/**/
+    1095,
 /**/
     1094,
 /**/