summaryrefslogtreecommitdiff
path: root/libxmlsec
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-09-09 11:45:13 +0200
committerMathias Bauer <mba@openoffice.org>2009-09-09 11:45:13 +0200
commited19c2b7675b480019529d3fee401e21088a0eef (patch)
treeca5360bd4349adac6ffb30dde5fd34c5b8900661 /libxmlsec
parent7980eecf81d9e4dbf370c3a13b96e4979c7923cf (diff)
parent4a5bdf1727fd9be7c59485dd977e5a507ad48cd7 (diff)
merge commit to DEV300_m57
Diffstat (limited to 'libxmlsec')
-rw-r--r--libxmlsec/makefile.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 950a49050014..817dc6d84658 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -77,9 +77,17 @@ CRYPTOLIB=nss
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+xmlsec_CC=$(CC)
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+xmlsec_CC+=-shared-libgcc
+.ENDIF
+xmlsec_LIBS=-lmingwthrd
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+xmlsec_LIBS+=-lstdc++_s
+.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF