Mercurial > vim
diff src/Make_mvc.mak @ 19382:e6f0b4fe0b6d v8.2.0249
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 12 Feb 2020 22:00:05 +0100 |
parents | 1e78bf92f168 |
children | a961efb326e5 |
line wrap: on
line diff
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -626,6 +626,12 @@ NODEFAULTLIB = 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,6 +675,9 @@ CFLAGS = $(CFLAGS) $(WP64CHECK) 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