diff options
| -rw-r--r-- | src/Make_cyg.mak | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak index 0930161d47..7ba2f9dbf6 100644 --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -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. @@ -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 ############################## diff --git a/src/version.c b/src/version.c index 5948b9062c..c8381a1ae4 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 821, +/**/ 820, /**/ 819, |