diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-15 18:03:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-15 18:03:32 +0100 |
| commit | 3d6d5cc3a417c04d9772596ea83f8e6b41321781 (patch) | |
| tree | c94cf372d02896acd47f290b0f4a61e0c355a9f3 | |
| parent | 5a46a58eb6e50cb5204909cc2202e3400761263f (diff) | |
| download | vim-git-3d6d5cc3a417c04d9772596ea83f8e6b41321781.tar.gz | |
patch 7.4.1095v7.4.1095
Problem: Can't build GvimExt with SDK 7.1.
Solution: Support using setenv.bat instead of vcvars32.bat. (Ken Takata)
| -rw-r--r-- | src/GvimExt/Makefile | 3 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile index b45198144..a57840fa1 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 f51fbfcde..6f0b84391 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 e0d94fda3..2c92c175f 100644 --- 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, |