Ken Takata wrote: > Hi Marslo, > > 2014/10/17 Fri 19:10:18 UTC+9 Marslo Jiao wrote: > > On Wednesday, 15 October 2014 18:07:31 UTC+8, Bram Moolenaar wrote: > > > Patch 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) > > > Files: src/Make_ming.mak, src/Make_cyg.mak > > > > > > *** ../vim-7.4.475/src/Make_ming.mak 2014-08-10 16:31:47.376709213 > > > +0200 > > > --- src/Make_ming.mak 2014-10-15 12:00:35.986008598 +0200 > > > *************** > > > *** 22,28 **** > > > # http://www.matcode.com/mpress.htm > > > # > > > # Maintained by Ron Aaron <[email protected]> et al. > > > ! # Updated 2012 Sep 5. > > > > > > #>>>>> choose options: > > > # set to yes for a debug build > > > --- 22,28 ---- > > > # http://www.matcode.com/mpress.htm > > > # > > > # Maintained by Ron Aaron <[email protected]> et al. > > > ! # Updated 2014 Oct 13. > > > > > > #>>>>> choose options: > > > # set to yes for a debug build > > > *************** > > > *** 613,619 **** > > > USE_STDCPLUS = yes > > > endif > > > endif > > > ! ifdef XPM > > > # Only allow XPM for a GUI build. > > > ifeq (yes, $(GUI)) > > > OBJ += $(OUTDIR)/xpm_w32.o > > > --- 613,619 ---- > > > USE_STDCPLUS = yes > > > endif > > > endif > > > ! ifneq ($(XPM),no) > > > # Only allow XPM for a GUI build. > > > ifeq (yes, $(GUI)) > > > OBJ += $(OUTDIR)/xpm_w32.o > > > *** ../vim-7.4.475/src/Make_cyg.mak 2014-08-10 16:31:47.372709213 > > > +0200 > > > --- src/Make_cyg.mak 2014-10-15 12:06:01.170009309 +0200 > > > *************** > > > *** 485,491 **** > > > endif > > > > > > ############################## > > > ! ifdef XPM > > > # Only allow XPM for a GUI build. > > > DEFINES += -DFEAT_XPM_W32 > > > INCLUDES += -I$(XPM)/include > > > --- 485,491 ---- > > > endif > > > > > > ############################## > > > ! ifneq ($(XPM),no) > > > # Only allow XPM for a GUI build. > > > DEFINES += -DFEAT_XPM_W32 > > > INCLUDES += -I$(XPM)/include > > > *** ../vim-7.4.475/src/version.c 2014-10-11 14:47:22.833275547 +0200 > > > --- src/version.c 2014-10-15 12:03:39.186008999 +0200 > > > *************** > > > *** 743,744 **** > > > --- 743,746 ---- > > > { /* Add new patch number below this line */ > > > + /**/ > > > + 476, > > > /**/ > > > > Error shows while using "GUI=yes" parameter, details as below: > > > > xpm_w32.c:31:17: fatal error: xpm.h: No such file or directory > > compilation terminated. > > Make_cyg.mak:657: recipe for target 'gobj/xpm_w32.o' failed > > make: *** [gobj/xpm_w32.o] Error 1 > > > > "GUI=no" can be built successfully. > > > > ------ > > > > My environment: > > - Windows 7 64bit > > - Using Cygwin > > - Command: > > make -B -f Make_cyg.mak PYTHON=/cygdrive/c/Marslo/MyProgramFiles/Python27 > > DYNAMIC_PYTHON=yes PYTHON_VER=27 > > PYTHON3=/cygdrive/c/Marslo/MyProgramFiles/Python34 DYNAMIC_PYTHON3=yes > > PYTHON3_VER=34 FEATURES=huge IME=yes GIME=yes MBYTE=yes CSCOPE=yes > > USERNAME=Marslo.Jiao USERDOMAIN=China GUI=no > > Sorry, it's my mistake. > Could you try the attached patch? > > Some part is copied from Make_ming.mak (7.3.653). > The patch 7.3.653 should also have updated Make_cyg.mak.
Merging Make_cyg.mak and Make_ming.mak might be a bit difficult, but perhaps we can at least move the parts that are the same to a common file and include it in both? We could gradually move more lines there. -- The greatest lies of all time: (1) The check is in the mail. (2) We have a really challenging assignment for you. (3) I love you. (4) All bugs have been fixed. (5) This won't hurt a bit. (6) Honey, I just need to debug this program and be home in 5 minutes. (7) I have just sent you an e-mail about that. (8) Of course I'll respect you in the morning. (9) I'm from the government, and I'm here to help you. /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
