|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.495
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.495
|
|
|
22c937 |
Problem: XPM isn't used correctly in the Cygwin Makefile.
|
|
|
22c937 |
Solution: Include the rules like in Make_ming.mak. (Ken Takata)
|
|
|
22c937 |
Files: src/Make_cyg.mak
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.494/src/Make_cyg.mak 2014-10-15 12:07:07.610009454 +0200
|
|
|
22c937 |
--- src/Make_cyg.mak 2014-11-05 13:38:03.688828413 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 485,497 ****
|
|
|
22c937 |
endif
|
|
|
22c937 |
|
|
|
22c937 |
##############################
|
|
|
22c937 |
ifneq ($(XPM),no)
|
|
|
22c937 |
# Only allow XPM for a GUI build.
|
|
|
22c937 |
DEFINES += -DFEAT_XPM_W32
|
|
|
22c937 |
! INCLUDES += -I$(XPM)/include
|
|
|
22c937 |
EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
|
|
|
22c937 |
EXTRA_LIBS += -L$(XPM)/lib -lXpm
|
|
|
22c937 |
endif
|
|
|
22c937 |
|
|
|
22c937 |
##############################
|
|
|
22c937 |
EXE = gvim$(DEBUG_SUFFIX).exe
|
|
|
22c937 |
--- 485,516 ----
|
|
|
22c937 |
endif
|
|
|
22c937 |
|
|
|
22c937 |
##############################
|
|
|
22c937 |
+ ifndef XPM
|
|
|
22c937 |
+ ifeq ($(ARCH),i386)
|
|
|
22c937 |
+ XPM = xpm/x86
|
|
|
22c937 |
+ endif
|
|
|
22c937 |
+ ifeq ($(ARCH),i486)
|
|
|
22c937 |
+ XPM = xpm/x86
|
|
|
22c937 |
+ endif
|
|
|
22c937 |
+ ifeq ($(ARCH),i586)
|
|
|
22c937 |
+ XPM = xpm/x86
|
|
|
22c937 |
+ endif
|
|
|
22c937 |
+ ifeq ($(ARCH),i686)
|
|
|
22c937 |
+ XPM = xpm/x86
|
|
|
22c937 |
+ endif
|
|
|
22c937 |
+ ifeq ($(ARCH),x86-64)
|
|
|
22c937 |
+ XPM = xpm/x64
|
|
|
22c937 |
+ endif
|
|
|
22c937 |
+ endif
|
|
|
22c937 |
+ ifdef XPM
|
|
|
22c937 |
ifneq ($(XPM),no)
|
|
|
22c937 |
# Only allow XPM for a GUI build.
|
|
|
22c937 |
DEFINES += -DFEAT_XPM_W32
|
|
|
22c937 |
! INCLUDES += -I$(XPM)/include -I$(XPM)/../include
|
|
|
22c937 |
EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
|
|
|
22c937 |
EXTRA_LIBS += -L$(XPM)/lib -lXpm
|
|
|
22c937 |
endif
|
|
|
22c937 |
+ endif
|
|
|
22c937 |
|
|
|
22c937 |
##############################
|
|
|
22c937 |
EXE = gvim$(DEBUG_SUFFIX).exe
|
|
|
22c937 |
*** ../vim-7.4.494/src/version.c 2014-11-05 09:53:19.989153321 +0100
|
|
|
22c937 |
--- src/version.c 2014-11-05 13:39:27.516826393 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 743,744 ****
|
|
|
22c937 |
--- 743,746 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 495,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
ARTHUR: You fight with the strength of many men, Sir knight.
|
|
|
22c937 |
I am Arthur, King of the Britons. [pause]
|
|
|
22c937 |
I seek the finest and the bravest knights in the land to join me
|
|
|
22c937 |
in my Court of Camelot. [pause]
|
|
|
22c937 |
You have proved yourself worthy; will you join me? [pause]
|
|
|
22c937 |
You make me sad. So be it. Come, Patsy.
|
|
|
22c937 |
BLACK KNIGHT: None shall pass.
|
|
|
22c937 |
The Quest for the Holy Grail (Monty Python)
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|