modules/media/src/main/native/jfxmedia/projects/mac/Makefile

rev 9888 : 8145602: Remove QTKit based media player
Summary: Removed obsolete QTKit based code, updated AVFoundation code to use a later SDK
Reviewed-by: almatvee

@@ -15,14 +15,10 @@
 OSX_PLATFORM_BASE = $(SRCBASE_DIR)/platform/osx
 
 TARGET_NAME = lib$(BASE_NAME).dylib
 TARGET = $(BUILD_DIR)/$(TARGET_NAME)
 
-# separate library for QTKit based platform
-QTK_NAME = lib$(BASE_NAME)_qtkit.dylib
-QTK_LIB = $(BUILD_DIR)/$(QTK_NAME)
-
 AVF_NAME = lib$(BASE_NAME)_avf.dylib
 AVF_LIB = $(BUILD_DIR)/$(AVF_NAME)
 
 # Set up base search path for source and headers
 VPATH = $(SRCBASE_DIR):$(GENERATED_HEADERS_DIR):$(JAVA_HOME)/include:$(JAVA_HOME)/include/darwin

@@ -142,11 +138,11 @@
 # ------------------------------------------------------------------
 # Rules
 
 .PHONY: default, checklibs
 
-default: $(TARGET) $(QTK_LIB) $(AVF_LIB)
+default: $(TARGET) $(AVF_LIB)
         @echo "Ensuring $(TARGET_NAME) does not link against QuickTime..."
         ! nm -m "$(TARGET)" | grep -E "(QTKit|QuickTime)"
         @echo "Ensuring $(AVF_NAME) does not link against QuickTime..."
         ! nm -m "$(AVF_LIB)" | grep -E "(QTKit|QuickTime)"
 

@@ -249,28 +245,5 @@
         $(CC) $(AVF_CFLAGS) $(AVF_INCLUDES) -MD -MF $(AVF_OBJBASE)/$*.d -x objective-c++ -c $< -o $@
 
 $(AVF_LIB): $(TARGET) $(AVF_OBJECTS)
         @mkdir -p $(dir $@)
         $(LINK)  $(AVF_LDFLAGS) -dynamiclib $(AVF_OBJECTS) -l$(BASE_NAME) -o $@
-
-
-# ------------------------------------------------------------------
-# QTKit platform lib rules
-
-QTK_OBJBASE = $(OBJBASE_DIR)/qtk
-QTK_CCFLAGS = -std=c++11 -stdlib=libc++ $(CFLAGS)
-QTK_LDFLAGS = $(LDFLAGS) \
-              -Wl,-install_name,@rpath/$(QTK_NAME) \
-              -framework QTKit
-
-QTK_SOURCES = platform/osx/QTKMediaPlayer.mm
-QTK_OBJECTS = $(patsubst %.mm,$(QTK_OBJBASE)/%.o,$(QTK_SOURCES))
-
--include $(QTK_OBJECTS:.o=.d)
-
-$(QTK_OBJBASE)/%.o: %.mm
-        @mkdir -p $(dir $@)
-        $(CC) $(QTK_CCFLAGS) $(INCLUDES) -MD -MF $(QTK_OBJBASE)/$*.d -x objective-c++ -c $< -o $@
-
-$(QTK_LIB): $(TARGET) $(QTK_OBJECTS)
-        @mkdir -p $(dir $@)
-        $(LINK)  $(QTK_LDFLAGS) -dynamiclib $(QTK_OBJECTS) -l$(BASE_NAME) -o $@