openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1560309 - /openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
Date Wed, 22 Jan 2014 10:46:38 GMT
Author: hdu
Date: Wed Jan 22 10:46:37 2014
New Revision: 1560309

URL: http://svn.apache.org/r1560309
Log:
#i114728# the quicktime framework was deprecated longer

Modified:
    openoffice/trunk/main/avmedia/source/quicktime/makefile.mk

Modified: openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/quicktime/makefile.mk?rev=1560309&r1=1560308&r2=1560309&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/quicktime/makefile.mk (original)
+++ openoffice/trunk/main/avmedia/source/quicktime/makefile.mk Wed Jan 22 10:46:37 2014
@@ -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
 
 .INCLUDE : target.mk
 
-.ELSE
-dummy:
-	@echo " Nothing to build for GUIBASE=$(GUIBASE)"
 .ENDIF
 
 ALLTAR : $(MISC)/avmediaQuickTime.component



Mime
View raw message