aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.4.495

Browse Source 
Problem:    XPM isn't used correctly in the Cygwin Makefile.
Solution:   Include the rules like in Make_ming.mak. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2014-11-05 13:43:21 +01:00
parent eda73607a7
commit 666578b539
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Make_cyg.mak
View File

@@ -485,13 +485,32 @@ USE_STDCPLUS = yes
endif 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) 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 -I$(XPM)/../include
EXTRA_OBJS += $(OUTDIR)/xpm_w32.o EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
EXTRA_LIBS += -L$(XPM)/lib -lXpm EXTRA_LIBS += -L$(XPM)/lib -lXpm
endif endif
endif
############################## ##############################
EXE = gvim$(DEBUG_SUFFIX).exe EXE = gvim$(DEBUG_SUFFIX).exe

2
src/version.c
View File

@@ -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 */
/**/
495,
/**/ /**/
494, 494,
/**/ /**/