|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.476
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.476
|
|
|
3ef2ca |
Problem: MingW: compiling with "XPM=no" doesn't work.
|
|
|
3ef2ca |
Solution: Check for the "no" value. (KF Leong) Also for Cygwin. (Ken
|
|
|
3ef2ca |
Takata)
|
|
|
3ef2ca |
Files: src/Make_ming.mak, src/Make_cyg.mak
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.475/src/Make_ming.mak 2014-08-10 16:31:47.376709213 +0200
|
|
|
3ef2ca |
--- src/Make_ming.mak 2014-10-15 12:00:35.986008598 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 22,28 ****
|
|
|
3ef2ca |
# http://www.matcode.com/mpress.htm
|
|
|
3ef2ca |
#
|
|
|
3ef2ca |
# Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
|
|
|
3ef2ca |
! # Updated 2012 Sep 5.
|
|
|
3ef2ca |
|
|
|
3ef2ca |
#>>>>> choose options:
|
|
|
3ef2ca |
# set to yes for a debug build
|
|
|
3ef2ca |
--- 22,28 ----
|
|
|
3ef2ca |
# http://www.matcode.com/mpress.htm
|
|
|
3ef2ca |
#
|
|
|
3ef2ca |
# Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
|
|
|
3ef2ca |
! # Updated 2014 Oct 13.
|
|
|
3ef2ca |
|
|
|
3ef2ca |
#>>>>> choose options:
|
|
|
3ef2ca |
# set to yes for a debug build
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 613,619 ****
|
|
|
3ef2ca |
USE_STDCPLUS = yes
|
|
|
3ef2ca |
endif
|
|
|
3ef2ca |
endif
|
|
|
3ef2ca |
! ifdef XPM
|
|
|
3ef2ca |
# Only allow XPM for a GUI build.
|
|
|
3ef2ca |
ifeq (yes, $(GUI))
|
|
|
3ef2ca |
OBJ += $(OUTDIR)/xpm_w32.o
|
|
|
3ef2ca |
--- 613,619 ----
|
|
|
3ef2ca |
USE_STDCPLUS = yes
|
|
|
3ef2ca |
endif
|
|
|
3ef2ca |
endif
|
|
|
3ef2ca |
! ifneq ($(XPM),no)
|
|
|
3ef2ca |
# Only allow XPM for a GUI build.
|
|
|
3ef2ca |
ifeq (yes, $(GUI))
|
|
|
3ef2ca |
OBJ += $(OUTDIR)/xpm_w32.o
|
|
|
3ef2ca |
*** ../vim-7.4.475/src/Make_cyg.mak 2014-08-10 16:31:47.372709213 +0200
|
|
|
3ef2ca |
--- src/Make_cyg.mak 2014-10-15 12:06:01.170009309 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 485,491 ****
|
|
|
3ef2ca |
endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
##############################
|
|
|
3ef2ca |
! ifdef XPM
|
|
|
3ef2ca |
# Only allow XPM for a GUI build.
|
|
|
3ef2ca |
DEFINES += -DFEAT_XPM_W32
|
|
|
3ef2ca |
INCLUDES += -I$(XPM)/include
|
|
|
3ef2ca |
--- 485,491 ----
|
|
|
3ef2ca |
endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
##############################
|
|
|
3ef2ca |
! ifneq ($(XPM),no)
|
|
|
3ef2ca |
# Only allow XPM for a GUI build.
|
|
|
3ef2ca |
DEFINES += -DFEAT_XPM_W32
|
|
|
3ef2ca |
INCLUDES += -I$(XPM)/include
|
|
|
3ef2ca |
*** ../vim-7.4.475/src/version.c 2014-10-11 14:47:22.833275547 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-10-15 12:03:39.186008999 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 476,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
Women are probably the main cause of free software starvation.
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|