--- old/modules/media/src/main/native/jfxmedia/projects/mac/Makefile 2017-12-07 16:44:41.000000000 -0800 +++ new/modules/media/src/main/native/jfxmedia/projects/mac/Makefile 2017-12-07 16:44:41.000000000 -0800 @@ -17,10 +17,6 @@ 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) @@ -144,7 +140,7 @@ .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..." @@ -251,26 +247,3 @@ $(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 $@