diff options
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 2 | ||||
| -rw-r--r-- | sc/qa/unit/helper/qahelper.hxx | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/download.lst b/download.lst index b8948f450618..90aa6e5fa0b0 100644 --- a/download.lst +++ b/download.lst @@ -68,7 +68,7 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz -export ORCUS_TARBALL := 5c4201c038183b2e9b69d317784b2245-liborcus-0.5.1.tar.bz2 +export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index f70a3775a32e..daded4dc1288 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -64,6 +64,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_ExternalProject_run,build,\ $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \ $(if $(filter YES,$(SYSTEM_ZLIB)),LIBS+=-lz) \ + $(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") \ + $(if $(filter MSC,$(COM)),CXXFLAGS+=$(BOOST_CXXFLAGS)) \ $(if $(filter NO,$(SYSTEM_ZLIB)),CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib) \ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost) \ $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \ diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 9558691aba86..0599771ca286 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -30,6 +30,7 @@ #define SC_QA_HELPER_HXX #include <test/bootstrapfixture.hxx> +#define __ORCUS_STATIC_LIB #include "helper/csv_handler.hxx" #include "helper/debughelper.hxx" #include "orcus/csv_parser.hpp" |