diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-11 22:40:31 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-13 01:54:41 -0400 |
| commit | f4f455c8882d858298b4e72a8801b2973f82656e (patch) | |
| tree | 20b28ccbfe4267d40fff8eeb60032d6173888108 /liborcus | |
| parent | a2fa2edb7e626034220340d7e1290d1da343fa03 (diff) | |
Deliver another library, though sc still can't link to it. Damn.
Change-Id: I6a0193df0cdb82e1855c5ac2d38976c7fb29d039
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalPackage_liborcus.mk | 1 | ||||
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk index d47e6082d691..c2fd898f74d5 100644 --- a/liborcus/ExternalPackage_liborcus.mk +++ b/liborcus/ExternalPackage_liborcus.mk @@ -15,6 +15,7 @@ ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.6.lib)) else $(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.6.a)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus-parser.a,src/parser/.libs/liborcus-parser-0.6.a)) endif # vim: set noet sw=4 ts=4: diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index ca98e8bf7c9e..b46180c09c8e 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -33,6 +33,7 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ $(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) \ ./configure \ --with-pic \ --enable-static \ @@ -45,7 +46,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : CXXFLAGS="$(BOOST_CXXFLAGS) $(if $(filter NO,$(SYSTEM_BOOST)),\ -I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \ - $(if $(filter YES,$(SYSTEM_ZLIB)),LIBS=-lz) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) |