summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-19 17:17:12 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-19 17:17:12 +0100
commitdda39aeafc94484e7d209d7bdfd2fc403b7383f5 (patch)
tree015c28248234dfd5b66a9981bc1ac453cdb1bf8b
parentca8b8d6956dd881de6446fc32c38e817a364a6cc (diff)
downloadvim-git-dda39aeafc94484e7d209d7bdfd2fc403b7383f5.tar.gz
patch 8.0.0093v8.0.0093
Problem: Not using multiprocess build feature. Solution: Enable multiprocess build with MSVC 10. (Ken Takata)
-rw-r--r--src/Make_mvc.mak11
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 0 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 435f56dd0..5160aebd7 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -297,6 +297,9 @@ CPU = ix86
# Flag to turn on Win64 compatibility warnings for VC7.x and VC8.
WP64CHECK = /Wp64
+# Use multiprocess build
+USE_MP = yes
+
#>>>>> path of the compiler and linker; name of include and lib directories
# PATH = c:\msvc20\bin;$(PATH)
# INCLUDE = c:\msvc20\include
@@ -473,6 +476,14 @@ NODEFAULTLIB =
NODEFAULTLIB = /nodefaultlib
!endif
+# Use multiprocess build on MSVC 10
+!if "$(USE_MP)"=="yes"
+!if $(MSVC_MAJOR) >= 10
+CFLAGS = $(CFLAGS) /MP
+!endif
+!endif
+
+
!ifdef NODEBUG
VIM = vim
!if "$(OPTIMIZE)" == "SPACE"
diff --git a/src/version.c b/src/version.c
index 5db35abc2..65f12936b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 93,
+/**/
92,
/**/
91,