[Libreoffice-commits] core.git: Branch 'aoo/trunk' - avmedia/source

[Herbert Dürr]

 avmedia/source/quicktime/makefile.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dbf0a30b0d2930e34cc6964982bb1141839ec5da
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Jan 22 10:46:37 2014 +0000

    #i114728# the quicktime framework was deprecated longer

diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index 69f3d79..808360f 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -25,8 +25,11 @@ PRJ=..$/..
 PRJNAME=avmedia
 TARGET=avmediaQuickTime
 
-# the QuickTime API has been removed in OSX SDK 10.7
-.IF "$(GUIBASE)"=="aqua" && "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
+# the QuickTime API has been deprecated since OSX 10.5 and has been removed in the OSX SDK 10.7
+.IF ("$(GUIBASE)" != "aqua") || ("${MACOSX_DEPLOYMENT_TARGET:s/.//}" >= "106")
+dummy:
+    @echo " Nothing to build for GUIBASE=$(GUIBASE) and OSX$(MACOSX_DEPLOYMENT_TARGET)"
+.ELSE
 
 # --- Settings ----------------------------------
 
@@ -77,9 +80,6 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 .INCLUDE : target.mk
 
-.ELSE
-dummy:
-    @echo " Nothing to build for GUIBASE=$(GUIBASE)"
 .ENDIF
 
 ALLTAR : $(MISC)/avmediaQuickTime.component