Mercurial > vim

comparison src/Make_cyg_ming.mak @ 13658:c83ec560409c v8.0.1701

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 539436dcb134
children 600a38fe5c00
comparison
equal deleted inserted replaced
13657:902858c74d9f 13658:c83ec560409c
26 # 26 #
27 # Maintained by Ron Aaron <ronaharon@yahoo.com> et al. 27 # Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
28 # Updated 2014 Oct 13. 28 # Updated 2014 Oct 13.
29 29
30 #>>>>> choose options: 30 #>>>>> choose options:
31 # FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE]
32 # Set to TINY to make minimal version (few features).
33 FEATURES=HUGE
34
31 # set to yes for a debug build 35 # set to yes for a debug build
32 DEBUG=no 36 DEBUG=no
37
33 # set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization 38 # set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization
34 OPTIMIZE=MAXSPEED 39 OPTIMIZE=MAXSPEED
40
35 # set to yes to make gvim, no for vim 41 # set to yes to make gvim, no for vim
36 GUI=yes 42 GUI=yes
43
37 # set to no if you do not want to use DirectWrite (DirectX) 44 # set to no if you do not want to use DirectWrite (DirectX)
38 # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. 45 # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64.
39 DIRECTX=yes 46 DIRECTX=yes
40 # FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE] 47
41 # Set to TINY to make minimal version (few features). 48 # Disable Color emoji support
42 FEATURES=HUGE 49 # (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.)
50 #COLOR_EMOJI=no
51
43 # Set to one of i386, i486, i586, i686 as the minimum target processor. 52 # Set to one of i386, i486, i586, i686 as the minimum target processor.
44 # For amd64/x64 architecture set ARCH=x86-64 . 53 # For amd64/x64 architecture set ARCH=x86-64 .
45 # If not set, it will be automatically detected. (Normally i686 or x86-64.) 54 # If not set, it will be automatically detected. (Normally i686 or x86-64.)
46 #ARCH=i686 55 #ARCH=i686
47 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin). 56 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin).
48 CROSS=no 57 CROSS=no
58
49 # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. 59 # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'.
50 # Use "yes" when the path does not need to be define. 60 # Use "yes" when the path does not need to be define.
51 #ICONV="." 61 #ICONV="."
52 ICONV=yes 62 ICONV=yes
53 GETTEXT=yes 63 GETTEXT=yes
64
54 # Set to yes to include multibyte support. 65 # Set to yes to include multibyte support.
55 MBYTE=yes 66 MBYTE=yes
67
56 # Set to yes to include IME support. 68 # Set to yes to include IME support.
57 IME=yes 69 IME=yes
58 DYNAMIC_IME=yes 70 DYNAMIC_IME=yes
71
59 # Set to yes to enable writing a postscript file with :hardcopy. 72 # Set to yes to enable writing a postscript file with :hardcopy.
60 POSTSCRIPT=no 73 POSTSCRIPT=no
74
61 # Set to yes to enable OLE support. 75 # Set to yes to enable OLE support.
62 OLE=no 76 OLE=no
77
63 # Set the default $(WINVER) to make it work with WinXP. 78 # Set the default $(WINVER) to make it work with WinXP.
64 ifndef WINVER 79 ifndef WINVER
65 WINVER = 0x0501 80 WINVER = 0x0501
66 endif 81 endif
82
67 # Set to yes to enable Cscope support. 83 # Set to yes to enable Cscope support.
68 CSCOPE=yes 84 CSCOPE=yes
85
69 # Set to yes to enable Netbeans support (requires CHANNEL). 86 # Set to yes to enable Netbeans support (requires CHANNEL).
70 NETBEANS=$(GUI) 87 NETBEANS=$(GUI)
88
71 # Set to yes to enable inter process communication. 89 # Set to yes to enable inter process communication.
72 ifeq (HUGE, $(FEATURES)) 90 ifeq (HUGE, $(FEATURES))
73 CHANNEL=yes 91 CHANNEL=yes
74 else 92 else
75 CHANNEL=$(GUI) 93 CHANNEL=$(GUI)
76 endif 94 endif
95
77 # Set to yes to enable terminal support. 96 # Set to yes to enable terminal support.
78 ifeq (HUGE, $(FEATURES)) 97 ifeq (HUGE, $(FEATURES))
79 TERMINAL=yes 98 TERMINAL=yes
80 else 99 else
81 TERMINAL=no 100 TERMINAL=no
586 605
587 # DirectWrite (DirectX) 606 # DirectWrite (DirectX)
588 ifeq ($(DIRECTX),yes) 607 ifeq ($(DIRECTX),yes)
589 # Only allow DirectWrite for a GUI build. 608 # Only allow DirectWrite for a GUI build.
590 ifeq (yes, $(GUI)) 609 ifeq (yes, $(GUI))
591 DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX -DFEAT_DIRECTX_COLOR_EMOJI 610 DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX
611 ifneq ($(COLOR_EMOJI),no)
612 DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI
613 endif
592 endif 614 endif
593 endif 615 endif
594 616
595 # Only allow XPM for a GUI build. 617 # Only allow XPM for a GUI build.
596 ifeq (yes, $(GUI)) 618 ifeq (yes, $(GUI))