Mercurial > vim

changeset 7591:4447dc38bc22 v7.4.1095

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Christian Brabandt <cb@256bit.org>
date Fri, 15 Jan 2016 18:15:05 +0100
parents 4d9814f9fc39
children c4dcf67bb056
files src/GvimExt/Makefile src/Make_mvc.mak src/version.c
diffstat 3 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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,