To: vim-dev@vim.org Subject: Patch 6.1.340 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.340 (extra, depends on 6.1.332) Problem: Win32: Can't compile the Perl interface with nmake. Solution: Don't compare the version number as a string but as a number. (Juergen Kraemer) Files: src/Make_mvc.mak *** ../vim61.339/src/Make_mvc.mak Sun Feb 16 22:21:17 2003 --- src/Make_mvc.mak Mon Feb 17 10:04:19 2003 *************** *** 403,409 **** !ifdef PERL !message Perl requested (version $(PERL_VER)) - root dir is "$(PERL)" !if "$(DYNAMIC_PERL)" == "yes" ! !if "$(PERL_VER)" >= "56" !message Perl DLL will be loaded dynamically !else !message Dynamic loading is not supported for Perl versions earlier than 5.6.0 --- 403,409 ---- !ifdef PERL !message Perl requested (version $(PERL_VER)) - root dir is "$(PERL)" !if "$(DYNAMIC_PERL)" == "yes" ! !if $(PERL_VER) >= 56 !message Perl DLL will be loaded dynamically !else !message Dynamic loading is not supported for Perl versions earlier than 5.6.0 *************** *** 420,426 **** PERL_INCDIR = $(PERL)\Lib$(PERL_ARCH)\Core # Version-dependent stuff ! !if "$(PERL_VER)" == "55" PERL_LIB = $(PERL_INCDIR)\perl.lib !else PERL_DLL = perl$(PERL_VER).dll --- 420,426 ---- PERL_INCDIR = $(PERL)\Lib$(PERL_ARCH)\Core # Version-dependent stuff ! !if $(PERL_VER) == 55 PERL_LIB = $(PERL_INCDIR)\perl.lib !else PERL_DLL = perl$(PERL_VER).dll *** ../vim61.339/src/version.c Sun Feb 16 22:58:57 2003 --- src/version.c Mon Feb 17 10:19:54 2003 *************** *** 608,609 **** --- 612,615 ---- { /* Add new patch number below this line */ + /**/ + 340, /**/ -- ARTHUR: Right! Knights! Forward! ARTHUR leads a charge toward the castle. Various shots of them battling on, despite being hit by a variety of farm animals. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///