Mercurial > vim
comparison src/Makefile @ 12437:5df4b95cc3ee v8.0.1098
patch 8.0.1098: build failure if libvterm installed
commit https://github.com/vim/vim/commit/b984b80cd835a483bdca1928bc50eb09b071f373
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 12 22:59:58 2017 +0200
patch 8.0.1098: build failure if libvterm installed
Problem: Build failure if libvterm installed on the system. (Oleh
Hushchenkov)
Solution: Change the CCCTERM argument order. (Ken Takata, closes #2080)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 12 Sep 2017 23:15:04 +0200 |
| parents | e9dbdc4d8279 |
| children | 3f16cf18386c |
comparison
equal
deleted
inserted
replaced
| 12436:125bea27ed71 | 12437:5df4b95cc3ee |
|---|---|
| 3297 $(CCC) -o $@ channel.c | 3297 $(CCC) -o $@ channel.c |
| 3298 | 3298 |
| 3299 Makefile: | 3299 Makefile: |
| 3300 @echo The name of the makefile MUST be "Makefile" (with capital M)!!!! | 3300 @echo The name of the makefile MUST be "Makefile" (with capital M)!!!! |
| 3301 | 3301 |
| 3302 CCCTERM = $(CCC) -Ilibvterm/include -DINLINE="" \ | 3302 CCCTERM = $(CCC_NF) -Ilibvterm/include $(ALL_CFLAGS) -DINLINE="" \ |
| 3303 -DVSNPRINTF=vim_vsnprintf \ | 3303 -DVSNPRINTF=vim_vsnprintf \ |
| 3304 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ | 3304 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ |
| 3305 -DWCWIDTH_FUNCTION=utf_uint2cells | 3305 -DWCWIDTH_FUNCTION=utf_uint2cells |
| 3306 | 3306 |
| 3307 objects/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) | 3307 objects/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) |