diff options
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0fc7d25fee0d..ece2bd75ef01 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -426,32 +426,37 @@ endif # SYSTEM_ZLIB ifneq ($(SYSTEM_JPEG),) define gb_LinkTarget__use_jpeg -$(call gb_LinkTarget_add_libs,$(1),-ljpeg) +$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_set_ldflags,$(1),\ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \ ) endef +gb_ExternalProject__use_jpeg := + else ifneq ($(filter JPEG_TURBO,$(BUILD_TYPE)),) define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,jpeg-turbo) \ + $(LIBJPEG_CFLAGS) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,jpeg-turbo)/.libs/libjpeg$(gb_StaticLibrary_PLAINEXT) \ -) +$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo,full) endef +define gb_ExternalProject__use_jpeg +$(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo) + +endef + else # !SYSTEM_JPEG define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,jpeg) \ + $(LIBJPEG_CFLAGS) \ $$(INCLUDE) \ ) @@ -459,6 +464,11 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ jpeg \ ) +define gb_ExternalProject__use_jpeg +$(call gb_ExternalProject_use_static_libraries,$(1),jpeg) + +endef + endef endif # SYSTEM_JPEG @@ -2674,6 +2684,7 @@ endef else # !SYSTEM_POPPLER define gb_LinkTarget__use_poppler +$(call gb_LinkTarget_use_external,$(1),jpeg) $(call gb_LinkTarget_use_external_project,$(1),poppler,full) $(call gb_LinkTarget_set_include,$(1),\ |