Mercurial > vim
changeset 6324:0079791cbbea v7.4.495
updated for version 7.4.495
Problem: XPM isn't used correctly in the Cygwin Makefile.
Solution: Include the rules like in Make_ming.mak. (Ken Takata)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Wed, 05 Nov 2014 13:43:21 +0100 |
parents | e44cc6d0ab4f |
children | 08adef366ea2 |
files | src/Make_cyg.mak src/version.c |
diffstat | 2 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -485,13 +485,32 @@ USE_STDCPLUS = yes endif ############################## +ifndef XPM +ifeq ($(ARCH),i386) +XPM = xpm/x86 +endif +ifeq ($(ARCH),i486) +XPM = xpm/x86 +endif +ifeq ($(ARCH),i586) +XPM = xpm/x86 +endif +ifeq ($(ARCH),i686) +XPM = xpm/x86 +endif +ifeq ($(ARCH),x86-64) +XPM = xpm/x64 +endif +endif +ifdef XPM ifneq ($(XPM),no) # Only allow XPM for a GUI build. DEFINES += -DFEAT_XPM_W32 -INCLUDES += -I$(XPM)/include +INCLUDES += -I$(XPM)/include -I$(XPM)/../include EXTRA_OBJS += $(OUTDIR)/xpm_w32.o EXTRA_LIBS += -L$(XPM)/lib -lXpm endif +endif ############################## EXE = gvim$(DEBUG_SUFFIX).exe