Mercurial > vim
changeset 13658:c83ec560409c v8.0.1701
patch 8.0.1701: can disable COLOR_EMOJI with MSVC but not MinGW
commit https://github.com/vim/vim/commit/cccd62d435097814ea93e384920443fb2419e663
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 12 20:23:48 2018 +0200
patch 8.0.1701: can disable COLOR_EMOJI with MSVC but not MinGW
Problem: Can disable COLOR_EMOJI with MSVC but not MinGW.
Solution: Add COLOR_EMOJI flag. Also add some empty lines for readability.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 12 Apr 2018 20:30:07 +0200 |
| parents | 902858c74d9f |
| children | 9d20ac681096 |
| files | src/Make_cyg_ming.mak src/version.c |
| diffstat | 2 files changed, 28 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -28,52 +28,71 @@ # Updated 2014 Oct 13. #>>>>> choose options: +# FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE] +# Set to TINY to make minimal version (few features). +FEATURES=HUGE + # set to yes for a debug build DEBUG=no + # set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization OPTIMIZE=MAXSPEED + # set to yes to make gvim, no for vim GUI=yes + # set to no if you do not want to use DirectWrite (DirectX) # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. DIRECTX=yes -# FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE] -# Set to TINY to make minimal version (few features). -FEATURES=HUGE + +# Disable Color emoji support +# (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.) +#COLOR_EMOJI=no + # Set to one of i386, i486, i586, i686 as the minimum target processor. # For amd64/x64 architecture set ARCH=x86-64 . # If not set, it will be automatically detected. (Normally i686 or x86-64.) #ARCH=i686 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin). CROSS=no + # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. # Use "yes" when the path does not need to be define. #ICONV="." ICONV=yes GETTEXT=yes + # Set to yes to include multibyte support. MBYTE=yes + # Set to yes to include IME support. IME=yes DYNAMIC_IME=yes + # Set to yes to enable writing a postscript file with :hardcopy. POSTSCRIPT=no + # Set to yes to enable OLE support. OLE=no + # Set the default $(WINVER) to make it work with WinXP. ifndef WINVER WINVER = 0x0501 endif + # Set to yes to enable Cscope support. CSCOPE=yes + # Set to yes to enable Netbeans support (requires CHANNEL). NETBEANS=$(GUI) + # Set to yes to enable inter process communication. ifeq (HUGE, $(FEATURES)) CHANNEL=yes else CHANNEL=$(GUI) endif + # Set to yes to enable terminal support. ifeq (HUGE, $(FEATURES)) TERMINAL=yes @@ -588,7 +607,10 @@ endif ifeq ($(DIRECTX),yes) # Only allow DirectWrite for a GUI build. ifeq (yes, $(GUI)) -DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX -DFEAT_DIRECTX_COLOR_EMOJI +DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX +ifneq ($(COLOR_EMOJI),no) +DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI +endif endif endif