To: vim_dev@googlegroups.com Subject: Patch 8.2.0249 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0249 Problem: MS-Windows: various warnings. Solution: Set the charset to utf-8. Add _WIN32_WINNT and _USING_V110_SDK71_. (Ken Takata, closes #5625) Files: src/GvimExt/Makefile, src/Make_mvc.mak *** ../vim-8.2.0248/src/GvimExt/Makefile 2019-04-11 17:20:57.000000000 +0200 --- src/GvimExt/Makefile 2020-02-12 21:50:31.768183868 +0100 *************** *** 10,15 **** --- 10,18 ---- !ifndef APPVER APPVER = 5.01 !endif + !ifndef WINVER + WINVER = 0x0501 + !endif !if "$(DEBUG)" != "yes" NODEBUG = 1 *************** *** 53,58 **** --- 56,68 ---- # include CPUARG cflags = $(cflags) $(CPUARG) + # set WINVER and _WIN32_WINNT + cflags = $(cflags) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) + + !if "$(CL)" == "/D_USING_V110_SDK71_" + rcflags = $(rcflags) /D_USING_V110_SDK71_ + !endif + SUBSYSTEM = console !if "$(SUBSYSTEM_VER)" != "" SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) *** ../vim-8.2.0248/src/Make_mvc.mak 2020-02-12 21:15:37.543497435 +0100 --- src/Make_mvc.mak 2020-02-12 21:50:01.212296766 +0100 *************** *** 626,631 **** --- 626,637 ---- NODEFAULTLIB = /nodefaultlib !endif + # Specify source code charset to suppress warning C4819 on non-English + # environment. Only available from MSVC 14. + !if $(MSVC_MAJOR) >= 14 + CFLAGS = $(CFLAGS) /source-charset:utf-8 + !endif + # Use multiprocess build on MSVC 10 !if ("$(USE_MP)" == "yes") && ($(MSVC_MAJOR) >= 10) CFLAGS = $(CFLAGS) /MP *************** *** 669,674 **** --- 675,683 ---- CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG) RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG + ! if "$(CL)" == "/D_USING_V110_SDK71_" + RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_ + ! endif ! ifdef USE_MSVCRT CFLAGS = $(CFLAGS) /MD LIBC = msvcrt.lib *** ../vim-8.2.0248/src/version.c 2020-02-12 21:15:37.543497435 +0100 --- src/version.c 2020-02-12 21:51:53.391882157 +0100 *************** *** 744,745 **** --- 744,747 ---- { /* Add new patch number below this line */ + /**/ + 249, /**/ -- hundred-and-one symptoms of being an internet addict: 63. You start using smileys in your snail mail. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///