Mercurial > vim

comparison src/Make_mvc.mak @ 15450:bb421f682528 v8.1.0733

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0733: too many #ifdefs for the multi-byte feature commit https://github.com/vim/vim/commit/2be7cb73f66cf69659195d9a8ad4beaa359f2865 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 12 16:10:51 2019 +0100 patch 8.1.0733: too many #ifdefs for the multi-byte feature Problem: Too many #ifdefs for the multi-byte feature. Solution: Tentatively always enable the multi-byte feature. If you have a problem with this, please discuss on the Vim maillist.
author Bram Moolenaar <Bram@vim.org>
date Sat, 12 Jan 2019 16:15:04 +0100
parents d94901eeb762
children 1d2b5c016f17
comparison
equal deleted inserted replaced
15449:869f88d11e31 15450:bb421f682528
24 # Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE) 24 # Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
25 # 25 #
26 # GUI interface: GUI=yes (default is no) 26 # GUI interface: GUI=yes (default is no)
27 # 27 #
28 # GUI with DirectWrite (DirectX): DIRECTX=yes 28 # GUI with DirectWrite (DirectX): DIRECTX=yes
29 # (default is yes if GUI=yes, requires GUI=yes and MBYTE=yes) 29 # (default is yes if GUI=yes, requires GUI=yes)
30 # 30 #
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 #
36 # Multibyte support: MBYTE=yes (default is yes for NORMAL, BIG, HUGE)
37 # 35 #
38 # IME support: IME=yes (requires GUI=yes) 36 # IME support: IME=yes (requires GUI=yes)
39 # 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
40 # is yes) 38 # is yes)
41 # Global IME support: GIME=yes (requires GUI=yes) 39 # Global IME support: GIME=yes (requires GUI=yes)
784 !endif 782 !endif
785 783
786 !if "$(GIME)" == "yes" 784 !if "$(GIME)" == "yes"
787 CFLAGS = $(CFLAGS) -DGLOBAL_IME 785 CFLAGS = $(CFLAGS) -DGLOBAL_IME
788 OBJ = $(OBJ) $(OUTDIR)\dimm_i.obj $(OUTDIR)\glbl_ime.obj 786 OBJ = $(OBJ) $(OUTDIR)\dimm_i.obj $(OUTDIR)\glbl_ime.obj
789 MBYTE = yes
790 !endif
791
792 !if "$(MBYTE)" == "yes"
793 CFLAGS = $(CFLAGS) -DFEAT_MBYTE
794 !endif 787 !endif
795 788
796 !if "$(GUI)" == "yes" 789 !if "$(GUI)" == "yes"
797 SUBSYSTEM = windows 790 SUBSYSTEM = windows
798 CFLAGS = $(CFLAGS) -DFEAT_GUI_W32 791 CFLAGS = $(CFLAGS) -DFEAT_GUI_W32