Mercurial > vim
comparison src/Make_cyg_ming.mak @ 11696:0a6136dfce35 v8.0.0731
patch 8.0.0731: cannot build the terminal feature on MS-Windows
commit https://github.com/vim/vim/commit/4fc63505d393451ad3780dc0390cb48587597aaf
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 19 11:28:17 2017 +0200
patch 8.0.0731: cannot build the terminal feature on MS-Windows
Problem: Cannot build the terminal feature on MS-Windows.
Solution: Add the Makefile changes. (Yasuhiro Matsumoto, closes https://github.com/vim/vim/issues/1851)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 19 Jul 2017 11:30:03 +0200 |
| parents | 70680eba1940 |
| children | 13ecb3e64399 |
comparison
equal
deleted
inserted
replaced
| 11695:914b6ba36fe4 | 11696:0a6136dfce35 |
|---|---|
| 71 ifeq (HUGE, $(FEATURES)) | 71 ifeq (HUGE, $(FEATURES)) |
| 72 CHANNEL=yes | 72 CHANNEL=yes |
| 73 else | 73 else |
| 74 CHANNEL=$(GUI) | 74 CHANNEL=$(GUI) |
| 75 endif | 75 endif |
| 76 TERMINAL=no | |
| 76 | 77 |
| 77 | 78 |
| 78 # Link against the shared version of libstdc++ by default. Set | 79 # Link against the shared version of libstdc++ by default. Set |
| 79 # STATIC_STDCPLUS to "yes" to link against static version instead. | 80 # STATIC_STDCPLUS to "yes" to link against static version instead. |
| 80 ifndef STATIC_STDCPLUS | 81 ifndef STATIC_STDCPLUS |
| 553 endif | 554 endif |
| 554 endif | 555 endif |
| 555 | 556 |
| 556 ifeq ($(CHANNEL),yes) | 557 ifeq ($(CHANNEL),yes) |
| 557 DEFINES += -DFEAT_JOB_CHANNEL | 558 DEFINES += -DFEAT_JOB_CHANNEL |
| 559 endif | |
| 560 | |
| 561 ifeq ($(TERMINAL),yes) | |
| 562 DEFINES += -DFEAT_TERMINAL | |
| 558 endif | 563 endif |
| 559 | 564 |
| 560 # DirectWrite (DirectX) | 565 # DirectWrite (DirectX) |
| 561 ifeq ($(DIRECTX),yes) | 566 ifeq ($(DIRECTX),yes) |
| 562 # Only allow DirectWrite for a GUI build. | 567 # Only allow DirectWrite for a GUI build. |
| 741 # You'll need libXpm.a from http://gnuwin32.sf.net | 746 # You'll need libXpm.a from http://gnuwin32.sf.net |
| 742 LIB += -L$(XPM)/lib -lXpm | 747 LIB += -L$(XPM)/lib -lXpm |
| 743 endif | 748 endif |
| 744 endif | 749 endif |
| 745 | 750 |
| 751 ifeq ($(TERMINAL),yes) | |
| 752 OBJ += $(OUTDIR)/terminal.o | |
| 753 endif | |
| 754 | |
| 746 | 755 |
| 747 ifdef MZSCHEME | 756 ifdef MZSCHEME |
| 748 MZSCHEME_SUFFIX = Z | 757 MZSCHEME_SUFFIX = Z |
| 749 endif | 758 endif |
| 750 | 759 |