Mercurial > vim

comparison src/Make_cyg.mak @ 4137:4936ee89b4bc v7.3.821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.821 Problem: Build with OLE and Cygwin is broken. (Steve Hall) Solution: Select static or shared stdc library. (Ken Takta)
author Bram Moolenaar <bram@vim.org>
date Sat, 16 Feb 2013 18:16:15 +0100
parents 448a6e7cf32e
children db401e5e4c5d
comparison
equal deleted inserted replaced
4136:c6107b4575a4 4137:4936ee89b4bc
104 104
105 ifndef OPTIMIZE 105 ifndef OPTIMIZE
106 OPTIMIZE = MAXSPEED 106 OPTIMIZE = MAXSPEED
107 endif 107 endif
108 108
109
110 # Link against the shared version of libstdc++ by default. Set
111 # STATIC_STDCPLUS to "yes" to link against static version instead.
112 ifndef STATIC_STDCPLUS
113 STATIC_STDCPLUS=no
114 endif
115
109 ### See feature.h for a list of optionals. 116 ### See feature.h for a list of optionals.
110 ### Any other defines can be included here. 117 ### Any other defines can be included here.
111 118
112 DEFINES = -DWIN32 -DHAVE_PATHDEF -DFEAT_$(FEATURES) \ 119 DEFINES = -DWIN32 -DHAVE_PATHDEF -DFEAT_$(FEATURES) \
113 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) 120 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
476 483
477 ############################## 484 ##############################
478 ifeq (yes, $(OLE)) 485 ifeq (yes, $(OLE))
479 DEFINES += -DFEAT_OLE 486 DEFINES += -DFEAT_OLE
480 EXTRA_OBJS += $(OUTDIR)/if_ole.o 487 EXTRA_OBJS += $(OUTDIR)/if_ole.o
481 EXTRA_LIBS += -loleaut32 -lstdc++ 488 EXTRA_LIBS += -loleaut32
489 ifeq (yes, $(STATIC_STDCPLUS))
490 EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic
491 else
492 EXTRA_LIBS += -lstdc++
493 endif
482 endif 494 endif
483 495
484 ############################## 496 ##############################
485 ifneq (sh.exe, $(SHELL)) 497 ifneq (sh.exe, $(SHELL))
486 DEL = rm 498 DEL = rm