Skip to content

Commit

Permalink
updated for version 7.3.821
Browse files Browse the repository at this point in the history
Problem:    Build with OLE and Cygwin is broken. (Steve Hall)
Solution:   Select static or shared stdc library. (Ken Takta)
  • Loading branch information
brammool committed Feb 16, 2013
1 parent feeaa68 commit 5004e88
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
14 changes: 13 additions & 1 deletion src/Make_cyg.mak
Expand Up @@ -106,6 +106,13 @@ ifndef OPTIMIZE
OPTIMIZE = MAXSPEED
endif


# Link against the shared version of libstdc++ by default. Set
# STATIC_STDCPLUS to "yes" to link against static version instead.
ifndef STATIC_STDCPLUS
STATIC_STDCPLUS=no
endif

### See feature.h for a list of optionals.
### Any other defines can be included here.

Expand Down Expand Up @@ -478,7 +485,12 @@ endif
ifeq (yes, $(OLE))
DEFINES += -DFEAT_OLE
EXTRA_OBJS += $(OUTDIR)/if_ole.o
EXTRA_LIBS += -loleaut32 -lstdc++
EXTRA_LIBS += -loleaut32
ifeq (yes, $(STATIC_STDCPLUS))
EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic
else
EXTRA_LIBS += -lstdc++
endif
endif

##############################
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -725,6 +725,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
821,
/**/
820,
/**/
Expand Down

0 comments on commit 5004e88

Please sign in to comment.