comparison 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
comparison
equal deleted inserted replaced
19381:95be753d41c0 19382:e6f0b4fe0b6d
624 NODEFAULTLIB = 624 NODEFAULTLIB =
625 !else 625 !else
626 NODEFAULTLIB = /nodefaultlib 626 NODEFAULTLIB = /nodefaultlib
627 !endif 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 # Use multiprocess build on MSVC 10 635 # Use multiprocess build on MSVC 10
630 !if ("$(USE_MP)" == "yes") && ($(MSVC_MAJOR) >= 10) 636 !if ("$(USE_MP)" == "yes") && ($(MSVC_MAJOR) >= 10)
631 CFLAGS = $(CFLAGS) /MP 637 CFLAGS = $(CFLAGS) /MP
632 !endif 638 !endif
633 639
667 CFLAGS = $(CFLAGS) $(WP64CHECK) 673 CFLAGS = $(CFLAGS) $(WP64CHECK)
668 ! endif 674 ! endif
669 675
670 CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG) 676 CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
671 RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG 677 RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
678 ! if "$(CL)" == "/D_USING_V110_SDK71_"
679 RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_
680 ! endif
672 ! ifdef USE_MSVCRT 681 ! ifdef USE_MSVCRT
673 CFLAGS = $(CFLAGS) /MD 682 CFLAGS = $(CFLAGS) /MD
674 LIBC = msvcrt.lib 683 LIBC = msvcrt.lib
675 ! else 684 ! else
676 LIBC = libcmt.lib 685 LIBC = libcmt.lib