summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-22 22:04:04 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-22 22:04:04 +0100
commitb7a59906d7ce41b7e74ec31b910375c21e427c0a (patch)
treef394435bc40c34b55cbaa911df74afefa6088705
parentd099e033703ce0772f152b8df8a763f0b65303ee (diff)
downloadvim-git-b7a59906d7ce41b7e74ec31b910375c21e427c0a.tar.gz
patch 8.0.0348: using shadow dir on Mac lack +clipboardv8.0.0348
Problem: When building with a shadow directory on macOS lacks the +clipboard feature. Solution: Link *.m files, specifically os_macosx.m. (Kazunobu Kuriyama)
-rw-r--r--src/Makefile2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index b5d39ec2c..2c670061a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2763,7 +2763,7 @@ SHADOWDIR = shadow
shadow: runtime pixmaps
mkdir $(SHADOWDIR)
- cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
+ cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
mkdir $(SHADOWDIR)/po
diff --git a/src/version.c b/src/version.c
index 2a54dc9cf..e70a0f938 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 */
/**/
+ 348,
+/**/
347,
/**/
346,