mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.4.476
Problem: MingW: compiling with "XPM=no" doesn't work. Solution: Check for the "no" value. (KF Leong) Also for Cygwin. (Ken Takata)
This commit is contained in:
parent
cbc246a331
commit
dcc1ce2f5a
@ -485,7 +485,7 @@ USE_STDCPLUS = yes
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
ifdef XPM
|
ifneq ($(XPM),no)
|
||||||
# Only allow XPM for a GUI build.
|
# Only allow XPM for a GUI build.
|
||||||
DEFINES += -DFEAT_XPM_W32
|
DEFINES += -DFEAT_XPM_W32
|
||||||
INCLUDES += -I$(XPM)/include
|
INCLUDES += -I$(XPM)/include
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
# http://www.matcode.com/mpress.htm
|
# http://www.matcode.com/mpress.htm
|
||||||
#
|
#
|
||||||
# Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
|
# Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
|
||||||
# Updated 2012 Sep 5.
|
# Updated 2014 Oct 13.
|
||||||
|
|
||||||
#>>>>> choose options:
|
#>>>>> choose options:
|
||||||
# set to yes for a debug build
|
# set to yes for a debug build
|
||||||
@ -613,7 +613,7 @@ LIB += -ld2d1 -ldwrite
|
|||||||
USE_STDCPLUS = yes
|
USE_STDCPLUS = yes
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifdef XPM
|
ifneq ($(XPM),no)
|
||||||
# Only allow XPM for a GUI build.
|
# Only allow XPM for a GUI build.
|
||||||
ifeq (yes, $(GUI))
|
ifeq (yes, $(GUI))
|
||||||
OBJ += $(OUTDIR)/xpm_w32.o
|
OBJ += $(OUTDIR)/xpm_w32.o
|
||||||
|
@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
476,
|
||||||
/**/
|
/**/
|
||||||
475,
|
475,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user