diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-14 14:20:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-15 11:47:02 +0000 |
| commit | ae967544463d1683dc4e26492c3646f1dc431576 (patch) | |
| tree | 461da88001b6a174e8f47d688c55bda571a12c6e /RepositoryExternal.mk | |
| parent | d61efe5806c9b87f026a8bc45a00dcb171881711 (diff) | |
just use turbo-jpeg as sole internal solution
prefer having nasm/yasm but if its not there warn and fallback
to disabling assembler optional goodness
Change-Id: Ib31ad81717842f743c2910d575a9ebbc279a9c79
Reviewed-on: https://gerrit.libreoffice.org/35189
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 284fe0a6906e..57b9a217dd6e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -388,7 +388,7 @@ endef gb_ExternalProject__use_jpeg := -else ifneq ($(filter JPEG_TURBO,$(BUILD_TYPE)),) +else define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ @@ -405,25 +405,6 @@ $(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo) endef -else # !SYSTEM_JPEG - -define gb_LinkTarget__use_jpeg -$(call gb_LinkTarget_set_include,$(1),\ - $(LIBJPEG_CFLAGS) \ - $$(INCLUDE) \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - jpeg \ -) - -endef - -define gb_ExternalProject__use_jpeg -$(call gb_ExternalProject_use_static_libraries,$(1),jpeg) - -endef - endif # SYSTEM_JPEG ifneq ($(SYSTEM_MYTHES),) |