Karsten Hopp 9b71e6
To: vim_dev@googlegroups.com
Karsten Hopp 9b71e6
Subject: Patch 7.3.821
Karsten Hopp 9b71e6
Fcc: outbox
Karsten Hopp 9b71e6
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 9b71e6
Mime-Version: 1.0
Karsten Hopp 9b71e6
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 9b71e6
Content-Transfer-Encoding: 8bit
Karsten Hopp 9b71e6
------------
Karsten Hopp 9b71e6
Karsten Hopp 9b71e6
Patch 7.3.821
Karsten Hopp 9b71e6
Problem:    Build with OLE and Cygwin is broken. (Steve Hall)
Karsten Hopp 9b71e6
Solution:   Select static or shared stdc library. (Ken Takata)
Karsten Hopp 9b71e6
Files:	    src/Make_cyg.mak
Karsten Hopp 9b71e6
Karsten Hopp 9b71e6
Karsten Hopp 9b71e6
*** ../vim-7.3.820/src/Make_cyg.mak	2013-02-13 17:06:06.000000000 +0100
Karsten Hopp 9b71e6
--- src/Make_cyg.mak	2013-02-16 18:09:49.000000000 +0100
Karsten Hopp 9b71e6
***************
Karsten Hopp 9b71e6
*** 106,111 ****
Karsten Hopp 9b71e6
--- 106,118 ----
Karsten Hopp 9b71e6
  OPTIMIZE = MAXSPEED
Karsten Hopp 9b71e6
  endif
Karsten Hopp 9b71e6
  
Karsten Hopp 9b71e6
+ 
Karsten Hopp 9b71e6
+ # Link against the shared version of libstdc++ by default.  Set
Karsten Hopp 9b71e6
+ # STATIC_STDCPLUS to "yes" to link against static version instead.
Karsten Hopp 9b71e6
+ ifndef STATIC_STDCPLUS
Karsten Hopp 9b71e6
+ STATIC_STDCPLUS=no
Karsten Hopp 9b71e6
+ endif
Karsten Hopp 9b71e6
+ 
Karsten Hopp 9b71e6
  ### See feature.h for a list of optionals.
Karsten Hopp 9b71e6
  ### Any other defines can be included here.
Karsten Hopp 9b71e6
  
Karsten Hopp 9b71e6
***************
Karsten Hopp 9b71e6
*** 478,484 ****
Karsten Hopp 9b71e6
  ifeq (yes, $(OLE))
Karsten Hopp 9b71e6
  DEFINES += -DFEAT_OLE
Karsten Hopp 9b71e6
  EXTRA_OBJS += $(OUTDIR)/if_ole.o
Karsten Hopp 9b71e6
! EXTRA_LIBS += -loleaut32 -lstdc++
Karsten Hopp 9b71e6
  endif
Karsten Hopp 9b71e6
  
Karsten Hopp 9b71e6
  ##############################
Karsten Hopp 9b71e6
--- 485,496 ----
Karsten Hopp 9b71e6
  ifeq (yes, $(OLE))
Karsten Hopp 9b71e6
  DEFINES += -DFEAT_OLE
Karsten Hopp 9b71e6
  EXTRA_OBJS += $(OUTDIR)/if_ole.o
Karsten Hopp 9b71e6
! EXTRA_LIBS += -loleaut32
Karsten Hopp 9b71e6
! ifeq (yes, $(STATIC_STDCPLUS))
Karsten Hopp 9b71e6
! EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic
Karsten Hopp 9b71e6
! else
Karsten Hopp 9b71e6
! EXTRA_LIBS += -lstdc++
Karsten Hopp 9b71e6
! endif
Karsten Hopp 9b71e6
  endif
Karsten Hopp 9b71e6
  
Karsten Hopp 9b71e6
  ##############################
Karsten Hopp 9b71e6
*** ../vim-7.3.820/src/version.c	2013-02-14 22:19:47.000000000 +0100
Karsten Hopp 9b71e6
--- src/version.c	2013-02-16 18:11:52.000000000 +0100
Karsten Hopp 9b71e6
***************
Karsten Hopp 9b71e6
*** 727,728 ****
Karsten Hopp 9b71e6
--- 727,730 ----
Karsten Hopp 9b71e6
  {   /* Add new patch number below this line */
Karsten Hopp 9b71e6
+ /**/
Karsten Hopp 9b71e6
+     821,
Karsten Hopp 9b71e6
  /**/
Karsten Hopp 9b71e6
Karsten Hopp 9b71e6
-- 
Karsten Hopp 9b71e6
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
Karsten Hopp 9b71e6
        King of all Britons, defeator of the Saxons, sovereign of all England!
Karsten Hopp 9b71e6
   [Pause]
Karsten Hopp 9b71e6
SOLDIER: Get away!
Karsten Hopp 9b71e6
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
Karsten Hopp 9b71e6
Karsten Hopp 9b71e6
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 9b71e6
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 9b71e6
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 9b71e6
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///