Mercurial > vim

comparison src/Make_mvc.mak @ 19159:352b74803d3e v8.2.0139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0139: MS-Windows: default for IME is inconsistent Commit: https://github.com/vim/vim/commit/f0764e8bb6511aa3bf1d6f52852b4284676ee661 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jan 20 22:05:34 2020 +0100 patch 8.2.0139: MS-Windows: default for IME is inconsistent Problem: MS-Windows: default for IME is inconsistent. Solution: Also make IME default enabled with MVC. (Ken Takata, closes https://github.com/vim/vim/issues/5508)
author Bram Moolenaar <Bram@vim.org>
date Mon, 20 Jan 2020 22:15:03 +0100
parents 38d18056e6e6
children 94eda51ba9ba
comparison
equal deleted inserted replaced
19158:c43e9d4d8c93 19159:352b74803d3e
31 # Color emoji support: COLOR_EMOJI=yes 31 # Color emoji support: COLOR_EMOJI=yes
32 # (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.) 32 # (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.)
33 # 33 #
34 # OLE interface: OLE=yes (usually with GUI=yes) 34 # OLE interface: OLE=yes (usually with GUI=yes)
35 # 35 #
36 # IME support: IME=yes (requires GUI=yes) 36 # IME support: IME=yes (default is yes)
37 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default 37 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default
38 # is yes) 38 # is yes)
39 # Global IME support: GIME=yes (requires GUI=yes) 39 # Global IME support: GIME=yes (requires GUI=yes)
40 # 40 #
41 # Terminal support: TERMINAL=yes (default is yes) 41 # Terminal support: TERMINAL=yes (default is yes)
810 OLE_OBJ = $(OUTDIR)\if_ole.obj 810 OLE_OBJ = $(OUTDIR)\if_ole.obj
811 OLE_IDL = if_ole.idl 811 OLE_IDL = if_ole.idl
812 OLE_LIB = oleaut32.lib 812 OLE_LIB = oleaut32.lib
813 !endif 813 !endif
814 814
815 !ifndef IME
816 IME = yes
817 !endif
815 !if "$(IME)" == "yes" 818 !if "$(IME)" == "yes"
816 CFLAGS = $(CFLAGS) -DFEAT_MBYTE_IME 819 CFLAGS = $(CFLAGS) -DFEAT_MBYTE_IME
817 ! ifndef DYNAMIC_IME 820 ! ifndef DYNAMIC_IME
818 DYNAMIC_IME = yes 821 DYNAMIC_IME = yes
819 ! endif 822 ! endif