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 | |
| 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
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 2 | ||||
| -rw-r--r-- | sc/Library_scfilt.mk | 7 | ||||
| -rw-r--r-- | zlib/StaticLibrary_zlib.mk | 4 |
3 files changed, 13 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 \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 6403539f1fc0..58e6d144095f 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ )) $(eval $(call gb_Library_use_externals,scfilt,\ + zlib \ orcus \ )) @@ -222,4 +223,10 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/orcus/orcusfiltersimpl \ )) +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_add_defs,scfilt,\ + -DSYSTEM_ZLIB \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/zlib/StaticLibrary_zlib.mk b/zlib/StaticLibrary_zlib.mk index 69e7017db63f..3071e614e722 100644 --- a/zlib/StaticLibrary_zlib.mk +++ b/zlib/StaticLibrary_zlib.mk @@ -18,6 +18,10 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\ UnpackedTarball/zlib/compress \ UnpackedTarball/zlib/crc32 \ UnpackedTarball/zlib/deflate \ + UnpackedTarball/zlib/gzclose \ + UnpackedTarball/zlib/gzlib \ + UnpackedTarball/zlib/gzread \ + UnpackedTarball/zlib/gzwrite \ UnpackedTarball/zlib/inffast \ UnpackedTarball/zlib/inflate \ UnpackedTarball/zlib/inftrees \ |