summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-02 18:50:45 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-02 18:50:45 +0100
commitbc073092254df17b282d162d8e8181e8f6a7a356 (patch)
tree39a96ad527ab190dd9a5d4c8c9badc682bccbc44
parentdf5b27b20ec023274fb0f5347973d5abcde7ddd6 (diff)
downloadvim-git-bc073092254df17b282d162d8e8181e8f6a7a356.tar.gz
patch 7.4.1240v7.4.1240
Problem: Visual studio tools are noisy. Solution: Suppress startup info. (Mike Williams)
-rw-r--r--src/GvimExt/Makefile2
-rw-r--r--src/Make_mvc.mak2
-rw-r--r--src/tee/Make_mvc.mak2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile
index a57840fa1..361c22932 100644
--- a/src/GvimExt/Makefile
+++ b/src/GvimExt/Makefile
@@ -52,7 +52,7 @@ gvimext.obj: gvimext.h
$(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
gvimext.res: gvimext.rc
- $(rc) $(rcflags) $(rcvars) gvimext.rc
+ $(rc) /nologo $(rcflags) $(rcvars) gvimext.rc
clean:
- if exist gvimext.dll del gvimext.dll
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index c34a63ed6..11d562959 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1294,7 +1294,7 @@ $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
$(OUTDIR)/vim.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp \
tearoff.bmp vim.ico vim_error.ico \
vim_alert.ico vim_info.ico vim_quest.ico
- $(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
+ $(RC) /nologo /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
iid_ole.c if_ole.h vim.tlb: if_ole.idl
midl /nologo /error none /proxy nul /iid iid_ole.c /tlb vim.tlb \
diff --git a/src/tee/Make_mvc.mak b/src/tee/Make_mvc.mak
index a957f944a..7fe22df37 100644
--- a/src/tee/Make_mvc.mak
+++ b/src/tee/Make_mvc.mak
@@ -1,7 +1,7 @@
# A very (if not the most) simplistic Makefile for MSVC
CC=cl
-CFLAGS=/O2
+CFLAGS=/O2 /nologo
tee.exe: tee.obj
$(CC) $(CFLAGS) /Fo$@ $**
diff --git a/src/version.c b/src/version.c
index 1caaff192..712377a23 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1240,
+/**/
1239,
/**/
1238,