diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-11-04 08:46:44 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-11-08 19:56:11 -0500 |
| commit | f745212f9650b481dc546c04ae26f3f58bfedd01 (patch) | |
| tree | 92c8eb2df3483e55bc64cc9bdb5c3f848c2e74cd /RepositoryExternal.mk | |
| parent | 70ec826eeb8f0b311095869e23be1db95fc9d109 (diff) | |
convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7688e4239606..007f7a468fb0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -840,7 +840,6 @@ gb_LinkTarget__use_graphite := endif # SYSTEM_GRAPHITE - ifeq ($(SYSTEM_ICU),YES) define gb_LinkTarget__use_icudata @@ -872,7 +871,7 @@ else gb_ICU_suffix:= endif -# icudata and icui18n is called icudt and icuin when built with MSVC :-( +# icudata and icui18n is called icudt and icuin when built with MSVC :-/ ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudt \ @@ -1184,7 +1183,7 @@ ifeq ($(SYSTEM_LCMS2),YES) define gb_LinkTarget__use_lcms2 $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(LCMS2_CFLAGS) \ + $(LCMS2_CFLAGS) \ ) $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) @@ -1199,8 +1198,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_lcms2 +$(call gb_LinkTarget_use_external_project,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/lcms2 \ + -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -1216,8 +1216,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_lcms2 +$(call gb_LinkTarget_use_external_project,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/lcms2 \ + -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -1226,6 +1227,11 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef +define gb_ExternalProject__use_lcms2 +$(call gb_ExternalProject_use_package,$(1),lcms2) + +endef + endif # ANDROID endif # SYSTEM_LCMS2 |