OSDN > ソフトウェアを探す > Vim > SCM > hg > vim > コミット

Vim
Fork

vim: コミット

Mirror of the Vim source from https://github.com/vim/vim

リビジョン	e6f0b4fe0b6d4ef0f9b92be02fee3bcca9da119e (tree)
日時	2020-02-13 06:00:05
作者	Bram Moolenaar <Bram@vim....>
コミッター	Bram Moolenaar

patch 8.2.0249: MS-Windows: various warnings

Commit: https://github.com/vim/vim/commit/3fb377fa78131004138b22a87afe33eeb7649b94
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 12 21:52:32 2020 +0100

patch 8.2.0249: MS-Windows: various warnings

Problem: MS-Windows: various warnings.
Solution: Set the charset to utf-8. Add _WIN32_WINNT and _USING_V110_SDK71_.

(Ken Takata, closes #5625)

diff -r 95be753d41c0 -r e6f0b4fe0b6d src/GvimExt/Makefile

--- a/src/GvimExt/Makefile Wed Feb 12 21:30:04 2020 +0100

+++ b/src/GvimExt/Makefile Wed Feb 12 22:00:05 2020 +0100

		@@ -53,6 +56,13 @@
53	56	# include CPUARG
54	57	cflags = $(cflags) $(CPUARG)
55	58
	59	+# set WINVER and _WIN32_WINNT
	60	+cflags = $(cflags) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
	61	+
	62	+!if "$(CL)" == "/D_USING_V110_SDK71_"
	63	+rcflags = $(rcflags) /D_USING_V110_SDK71_
	64	+!endif
	65	+
56	66	SUBSYSTEM = console
57	67	!if "$(SUBSYSTEM_VER)" != ""
58	68	SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER)

diff -r 95be753d41c0 -r e6f0b4fe0b6d src/Make_mvc.mak

--- a/src/Make_mvc.mak Wed Feb 12 21:30:04 2020 +0100

+++ b/src/Make_mvc.mak Wed Feb 12 22:00:05 2020 +0100

		@@ -626,6 +626,12 @@
626	626	NODEFAULTLIB = /nodefaultlib
627	627	!endif
628	628
	629	+# Specify source code charset to suppress warning C4819 on non-English
	630	+# environment. Only available from MSVC 14.
	631	+!if $(MSVC_MAJOR) >= 14
	632	+CFLAGS = $(CFLAGS) /source-charset:utf-8
	633	+!endif
	634	+
629	635	# Use multiprocess build on MSVC 10
630	636	!if ("$(USE_MP)" == "yes") && ($(MSVC_MAJOR) >= 10)
631	637	CFLAGS = $(CFLAGS) /MP

		@@ -669,6 +675,9 @@
669	675
670	676	CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
671	677	RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
	678	+! if "$(CL)" == "/D_USING_V110_SDK71_"
	679	+RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_
	680	+! endif
672	681	! ifdef USE_MSVCRT
673	682	CFLAGS = $(CFLAGS) /MD
674	683	LIBC = msvcrt.lib

diff -r 95be753d41c0 -r e6f0b4fe0b6d src/version.c

--- a/src/version.c Wed Feb 12 21:30:04 2020 +0100

+++ b/src/version.c Wed Feb 12 22:00:05 2020 +0100

		@@ -743,6 +743,8 @@
743	743	static int included_patches[] =
744	744	{ /* Add new patch number below this line */
745	745	/**/
	746	+ 249,
	747	+/**/
746	748	248,
747	749	/**/
748	750	247,