Get it to build on Windows, with MSVC compiler.
Took me 3 days just to get it to work... Change-Id: Ie28dc9b4ddb967a547cad33da18911b77bb9d558
This commit is contained in:
parent
66c213adb0
commit
49b0b69460
5 changed files with 22 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
|
|
@ -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
|
||||
|
|
|
@ -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\
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in a new issue