diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-11-27 00:57:11 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-11-28 10:01:30 -0500 |
| commit | 3f662c726d5fb53aa3374866dab1f8c8246ca804 (patch) | |
| tree | fe81059c01867eaa71a3f64c5860f1f3322b1021 /liborcus | |
| parent | 337efa331a55623335b6e806b6be4af729d57320 (diff) | |
Get it to build on Windows with liborcus gnumeric bits enabled.
Now scfilt must statically link zlib because gnumeric uses gzip
compression.
Change-Id: I79c527d381d3c2f9bccdf091ff2b0799efee4700
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index d583a22fc6f6..6e225f9f84a2 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -23,6 +23,7 @@ ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ && touch $@ @@ -30,6 +31,7 @@ else $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static-nozip.vcproj \ && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ |