diff options
| author | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
| commit | da1320efe152132d088042ae8857571113fad5e3 (patch) | |
| tree | 1c98d8a24f20dbdb8a7c1c88c89d6bc4cb0ba6db /libxml2/makefile.mk | |
| parent | 33474c4fff35faaedbd93461acb24496160f820f (diff) | |
| parent | d66343ab594fac375f4e3fc939594e9ebe5d4963 (diff) | |
sb126: merged in DEV300_m84
Diffstat (limited to 'libxml2/makefile.mk')
| -rw-r--r-- | libxml2/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 70796380c3d9..2c80066ccec1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -55,17 +55,17 @@ PATCH_FILES=libxml2-configure.patch \ .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -xml2_CC=$(CC) +xml2_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" xml2_CC+=-shared-libgcc .ENDIF -xml2_LIBS=-lws2_32 -lmingwthrd +xml2_LIBS=-lws2_32 .IF "$(MINGW_SHARED_GXXLIB)"=="YES" xml2_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP=objdump BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE |