rpms / vim

Clone
Source Code
GIT

Blame 7.4.720

c4 c5 c5-plus c6 c6-plus c7 c7-alt c7-beta c8 c8-beta c8s c9 c9-beta c9s-sig-hyperscale
  1.   0b8c992152071c396ee1b18045f4e1afd6de667f
  2.   7.4.720
Blob History Raw
Karsten Hopp 69bc7b 
To: vim_dev@googlegroups.com
Karsten Hopp 69bc7b 
Subject: Patch 7.4.720
Karsten Hopp 69bc7b 
Fcc: outbox
Karsten Hopp 69bc7b 
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 69bc7b 
Mime-Version: 1.0
Karsten Hopp 69bc7b 
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 69bc7b 
Content-Transfer-Encoding: 8bit
Karsten Hopp 69bc7b 
------------
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
Patch 7.4.720
Karsten Hopp 69bc7b 
Problem:    Can't build with Visual Studio 2015.
Karsten Hopp 69bc7b 
Solution:   Recognize the "version 14" numbers and omit /nodefaultlib when
Karsten Hopp 69bc7b 
            appropriate. (Paul Moore)
Karsten Hopp 69bc7b 
Files:      src/Make_mvc.mak
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
*** ../vim-7.4.719/src/Make_mvc.mak	2014-11-05 13:53:13.188806497 +0100
Karsten Hopp 69bc7b 
--- src/Make_mvc.mak	2015-05-04 16:16:55.716553990 +0200
Karsten Hopp 69bc7b 
***************
Karsten Hopp 69bc7b 
*** 343,349 ****
Karsten Hopp 69bc7b 
  # gdi32.lib and comdlg32.lib for printing support
Karsten Hopp 69bc7b 
  # ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
Karsten Hopp 69bc7b 
  CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
Karsten Hopp 69bc7b 
!           comdlg32.lib ole32.lib uuid.lib /machine:$(CPU) /nodefaultlib
Karsten Hopp 69bc7b 
  !if "$(DELAYLOAD)" == "yes"
Karsten Hopp 69bc7b 
  CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b 
--- 343,349 ----
Karsten Hopp 69bc7b 
  # gdi32.lib and comdlg32.lib for printing support
Karsten Hopp 69bc7b 
  # ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
Karsten Hopp 69bc7b 
  CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
Karsten Hopp 69bc7b 
!           comdlg32.lib ole32.lib uuid.lib /machine:$(CPU)
Karsten Hopp 69bc7b 
  !if "$(DELAYLOAD)" == "yes"
Karsten Hopp 69bc7b 
  CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b 
***************
Karsten Hopp 69bc7b 
*** 446,451 ****
Karsten Hopp 69bc7b 
--- 446,454 ----
Karsten Hopp 69bc7b 
  !if "$(_NMAKE_VER)" == "12.00.21005.1"
Karsten Hopp 69bc7b 
  MSVCVER = 12.0
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b 
+ !if "$(_NMAKE_VER)" == "14.00.22609.0"
Karsten Hopp 69bc7b 
+ MSVCVER = 14.0
Karsten Hopp 69bc7b 
+ !endif
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
  # Abort building VIM if version of VC is unrecognised.
Karsten Hopp 69bc7b 
***************
Karsten Hopp 69bc7b 
*** 460,466 ****
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
  # Convert processor ID to MVC-compatible number
Karsten Hopp 69bc7b 
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0") && ("$(MSVCVER)" != "12.0")
Karsten Hopp 69bc7b 
  !if "$(CPUNR)" == "i386"
Karsten Hopp 69bc7b 
  CPUARG = /G3
Karsten Hopp 69bc7b 
  !elseif "$(CPUNR)" == "i486"
Karsten Hopp 69bc7b 
--- 463,469 ----
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
  # Convert processor ID to MVC-compatible number
Karsten Hopp 69bc7b 
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0") && ("$(MSVCVER)" != "12.0") && ("$(MSVCVER)" != "14.0")
Karsten Hopp 69bc7b 
  !if "$(CPUNR)" == "i386"
Karsten Hopp 69bc7b 
  CPUARG = /G3
Karsten Hopp 69bc7b 
  !elseif "$(CPUNR)" == "i486"
Karsten Hopp 69bc7b 
***************
Karsten Hopp 69bc7b 
*** 484,489 ****
Karsten Hopp 69bc7b 
--- 487,499 ----
Karsten Hopp 69bc7b 
  LIBC =
Karsten Hopp 69bc7b 
  DEBUGINFO = /Zi
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
+ # Don't use /nodefaultlib on MSVC 14
Karsten Hopp 69bc7b 
+ !if "$(MSVCVER)" == "14.0"
Karsten Hopp 69bc7b 
+ NODEFAULTLIB =
Karsten Hopp 69bc7b 
+ !else
Karsten Hopp 69bc7b 
+ NODEFAULTLIB = /nodefaultlib
Karsten Hopp 69bc7b 
+ !endif
Karsten Hopp 69bc7b 
+
Karsten Hopp 69bc7b 
  !ifdef NODEBUG
Karsten Hopp 69bc7b 
  VIM = vim
Karsten Hopp 69bc7b 
  !if "$(OPTIMIZE)" == "SPACE"
Karsten Hopp 69bc7b 
***************
Karsten Hopp 69bc7b 
*** 655,661 ****
Karsten Hopp 69bc7b 
  GUI_LIB = \
Karsten Hopp 69bc7b 
  	gdi32.lib version.lib $(IME_LIB) \
Karsten Hopp 69bc7b 
  	winspool.lib comctl32.lib advapi32.lib shell32.lib \
Karsten Hopp 69bc7b 
! 	/machine:$(CPU) /nodefaultlib
Karsten Hopp 69bc7b 
  !else
Karsten Hopp 69bc7b 
  SUBSYSTEM = console
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b 
--- 665,671 ----
Karsten Hopp 69bc7b 
  GUI_LIB = \
Karsten Hopp 69bc7b 
  	gdi32.lib version.lib $(IME_LIB) \
Karsten Hopp 69bc7b 
  	winspool.lib comctl32.lib advapi32.lib shell32.lib \
Karsten Hopp 69bc7b 
! 	/machine:$(CPU)
Karsten Hopp 69bc7b 
  !else
Karsten Hopp 69bc7b 
  SUBSYSTEM = console
Karsten Hopp 69bc7b 
  !endif
Karsten Hopp 69bc7b 
***************
Karsten Hopp 69bc7b 
*** 976,982 ****
Karsten Hopp 69bc7b 
  !ENDIF
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
  LINKARGS1 = $(linkdebug) $(conflags)
Karsten Hopp 69bc7b 
! LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB)  user32.lib $(SNIFF_LIB) \
Karsten Hopp 69bc7b 
  		$(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
Karsten Hopp 69bc7b 
  		$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
--- 986,992 ----
Karsten Hopp 69bc7b 
  !ENDIF
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
  LINKARGS1 = $(linkdebug) $(conflags)
Karsten Hopp 69bc7b 
! LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
Karsten Hopp 69bc7b 
  		$(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
Karsten Hopp 69bc7b 
  		$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
*** ../vim-7.4.719/src/version.c	2015-05-04 16:10:21.397000027 +0200
Karsten Hopp 69bc7b 
--- src/version.c	2015-05-04 16:14:29.614201353 +0200
Karsten Hopp 69bc7b 
***************
Karsten Hopp 69bc7b 
*** 743,744 ****
Karsten Hopp 69bc7b 
--- 743,746 ----
Karsten Hopp 69bc7b 
  {   /* Add new patch number below this line */
Karsten Hopp 69bc7b 
+ /**/
Karsten Hopp 69bc7b 
+     720,
Karsten Hopp 69bc7b 
  /**/
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
--
Karsten Hopp 69bc7b 
If they don't keep on exercising their lips, he thought, their brains
Karsten Hopp 69bc7b 
start working.
Karsten Hopp 69bc7b 
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
Karsten Hopp 69bc7b
Karsten Hopp 69bc7b 
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 69bc7b 
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 69bc7b 
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 69bc7b 
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation