diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 15:23:23 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 15:23:51 -0600 |
| commit | faef2e51d0c7b74334a11400b205daf382805780 (patch) | |
| tree | 8324ebfc11e6e7cd8cd7d81ea29a1511b09760f0 /lcms2 | |
| parent | 94a6776e2ae4e61bc58081ff6d734890f1458c5a (diff) | |
fix some lcms2 gbuildification breakages...
Change-Id: Icad3132c1710c62559c35964fe5ce3f466646f13
Diffstat (limited to 'lcms2')
| -rw-r--r-- | lcms2/ExternalPackage_lcms2.mk | 8 | ||||
| -rw-r--r-- | lcms2/prj/build.lst | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index d1c1d3cc98e9..628930f321e3 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -10,8 +10,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2)) $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,inc/lcms2/lcms2.h,include/lcms2.h)) + ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.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) @@ -23,6 +25,8 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib)) $(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll)) endif else -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so.2.0.4)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4)) endif # vim: set noet sw=4 ts=4: diff --git a/lcms2/prj/build.lst b/lcms2/prj/build.lst index 551f0f385474..e9c203e5b484 100644 --- a/lcms2/prj/build.lst +++ b/lcms2/prj/build.lst @@ -1,3 +1,2 @@ lcms lcms2 : soltools ZLIB:zlib NULL -lcms lcms2 usr1 - all lcms_mkout NULL -lcms lcms2 nmake - all lcms_libwpd NULL +lcms lcms2/prj nmake - all lcms_prj NULL |