diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 22:04:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 00:24:14 +0200 |
| commit | 25f65f26a25e1ca275e54b9f62c45c7e872adec9 (patch) | |
| tree | 39a7d1805d48d5071bd56203f0975db5902f9d4a /external/lcms2 | |
| parent | b177b3067539f6c80f223b08ec772b174e721e8e (diff) | |
lcms2: use libraries from WORKDIR
Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5
Diffstat (limited to 'external/lcms2')
| -rw-r--r-- | external/lcms2/ExternalPackage_lcms2.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk index 395be9a1b9f3..4d1c98e414db 100644 --- a/external/lcms2/ExternalPackage_lcms2.mk +++ b/external/lcms2/ExternalPackage_lcms2.mk @@ -8,25 +8,23 @@ # $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2)) + $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.dylib)) $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib)) -else ifeq ($(filter-out IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a)) else ifeq ($(OS),WNT) ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll)) else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2.lib)) # note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is # actually called LCMS2D.DLL then $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) -endif -else -$(eval $(call gb_ExternalPackage_add_symbolic_link,lcms2,lib/liblcms2.so,liblcms2.so.2)) +endif # $(COM) +else # $(OS) != WNT/MACOSX $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4)) -endif +endif # $(OS) +endif # $(DISABLE_DYNLOADING) + # vim: set noet sw=4 ts=4: |