diff options
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | boost/prj/d.lst | 1 | ||||
| -rw-r--r-- | liborcus/makefile.mk | 17 | ||||
| -rw-r--r-- | liborcus/prj/d.lst | 2 | ||||
| -rw-r--r-- | sc/source/filter/orcus/orcusfiltersimpl.cxx | 2 |
5 files changed, 22 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7a1289eddcb7..66b3480aeb7a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1856,6 +1856,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ endif # SYSTEM_PYTHON +# ORCUS ifeq ($(SYSTEM_LIBORCUS),YES) define gb_LinkTarget__use_orcus @@ -1870,14 +1871,13 @@ endef else # !SYSTEM_LIBORCUS $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - orcus-0.2 \ + orcus \ )) define gb_LinkTarget__use_orcus $(call gb_LinkTarget_use_static_libraries,$(1),\ - orcus-0.2 \ + orcus \ ) - endef endif # SYSTEM_LIBORCUS diff --git a/boost/prj/d.lst b/boost/prj/d.lst index e69de29bb2d1..8b137891791f 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -0,0 +1 @@ + diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk index e57bb0830ddf..64b1e7b436b1 100644 --- a/liborcus/makefile.mk +++ b/liborcus/makefile.mk @@ -33,12 +33,23 @@ TARGET=orcus .ENDIF TARFILE_NAME=liborcus_0.1.0 -TARFILE_MD5=870f887bad82663146676017671efb60 +TARFILE_MD5=9f4fecdd1267a2a685f06de8508c88ff PATCH_FILES= +.IF "$(GUI)$(COM)"=="WNTMSC" + +BUILD_DIR=vsprojects/liborcus-static-nozip +BUILD_ACTION=export BOOST_INCLUDE_DIR=$(OUTDIR)/inc && \ + $(COMPATH)$/vcpackages$/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" + +.ELSE + CONFIGURE_DIR= -CONFIGURE_ACTION=./autogen.sh \ +CONFIGURE_ACTION=./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ --with-mdds-include-path=$(OUTDIR)/inc \ --disable-libzip \ --disable-debug \ @@ -47,6 +58,8 @@ CONFIGURE_ACTION=./autogen.sh \ BUILD_ACTION=make BUILD_DIR= +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk diff --git a/liborcus/prj/d.lst b/liborcus/prj/d.lst index 7c837284a411..9e6eb02303b3 100644 --- a/liborcus/prj/d.lst +++ b/liborcus/prj/d.lst @@ -6,4 +6,4 @@ mkdir: %_DEST%\inc\orcus\spreadsheet ..\%__SRC%\misc\build\liborcus*\src\liborcus\.libs\liborcus-0.2.a %_DEST%\lib\ -..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib +..\%__SRC%\misc\build\liborcus*\vsprojects\liborcus-static-nozip\Release\orcus.lib %_DEST%\lib\ diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index a45abfca5e85..39cdb52ef6a4 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -13,6 +13,8 @@ #include "orcusfiltersimpl.hxx" +#define __ORCUS_STATIC_LIB +#define BOOST_DISABLE_THREADS #include <orcus/spreadsheet/import_interface.hpp> #include <orcus/orcus_csv.hpp> |