Kaydet (Commit) 78310ffb authored tarafından Douglas Mencken's avatar Douglas Mencken Kaydeden (comit) jan iversen

The logic is “ no QuickTime in the 10.12 SDK & beyond ”

instead of “ QuickTime only in 10.8 10.9 10.10 & 10.11 ”

related commits are
  a4e81b7c
  bfbbbd87

Change-Id: Ie65abb736aa11ad063edeaed798d2e03db1684fe
Reviewed-on: https://gerrit.libreoffice.org/29268Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
üst 833d952a
......@@ -283,7 +283,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(filter MACOSX,$(OS)),\
avmediaMacAVF \
$(if $(ENABLE_MACOSX_SANDBOX),,\
$(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),avmediaQuickTime) \
$(if $(shell test $(MACOSX_SDK_VERSION) -ge 101200 || echo not),avmediaQuickTime) \
) \
) \
$(call gb_Helper_optional,SCRIPTING, \
......
......@@ -37,7 +37,7 @@ endif
ifeq ($(OS),MACOSX)
ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
ifneq ($(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),)
ifneq ($(shell test $(MACOSX_SDK_VERSION) -ge 101200; echo $$?),0)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaQuickTime \
))
......
......@@ -127,7 +127,7 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(filter MACOSX,$(OS)), \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
$(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)), \
$(if $(shell test $(MACOSX_SDK_VERSION) -ge 101200 || echo nope), \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
) \
) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment