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.
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index cefc430..81dd937 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -28,52 +28,71 @@
# Updated 2014 Oct 13.
#>>>>> choose options:
-# 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
+
+# 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
+
+# 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 @@
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
diff --git a/src/version.c b/src/version.c
index 5386fc5..2b0105b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1701,
+/**/
1700,
/**/
1699,