diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-12-14 13:15:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-12-14 13:15:19 +0100 |
| commit | 7f88b65f6cde3d69386e461f61271a271b79b7e8 (patch) | |
| tree | c01bfcc823cae66433a91285a579a6bd0e590ee0 /src/Make_mvc.mak | |
| parent | a6d4849c711379b773529afaed640455287ac934 (diff) | |
| download | vim-git-7f88b65f6cde3d69386e461f61271a271b79b7e8.tar.gz | |
patch 8.0.1390: DirectX scrolling can be slow, vertical positioning is offv8.0.1390
Problem: DirectX scrolling can be slow, vertical positioning is off.
Solution: Make scroll slightly faster when using "scrlines:1". Fix y
position of displayed text. Fix DirectX with non-utf8 encoding.
(Ken Takata, closes #2440)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 5a656987b..b496e5a5c 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -25,12 +25,15 @@ # # GUI interface: GUI=yes (default is no) # -# GUI with DirectWrite(DirectX): DIRECTX=yes -# (default is no, requires GUI=yes) +# GUI with DirectWrite (DirectX): DIRECTX=yes +# (default is no, requires GUI=yes and MBYTE=yes) +# +# Color emoji support: COLOR_EMOJI=yes +# (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.) # # OLE interface: OLE=yes (usually with GUI=yes) # -# Multibyte support: MBYTE=yes (default is no) +# Multibyte support: MBYTE=yes (default is yes for NORMAL, BIG, HUGE) # # IME support: IME=yes (requires GUI=yes) # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default @@ -419,9 +422,12 @@ NBDEBUG_SRC = nbdebug.c NETBEANS_LIB = WSock32.lib !endif -# DirectWrite(DirectX) +# DirectWrite (DirectX) !if "$(DIRECTX)" == "yes" DIRECTX_DEFS = -DFEAT_DIRECTX -DDYNAMIC_DIRECTX +!if "$(COLOR_EMOJI)" != "no" +DIRECTX_DEFS = $(DIRECTX_DEFS) -DFEAT_DIRECTX_COLOR_EMOJI +!endif DIRECTX_INCL = gui_dwrite.h DIRECTX_OBJ = $(OUTDIR)\gui_dwrite.obj !endif |