< prev index next >
modules/media/src/main/native/jfxmedia/projects/mac/Makefile
Print this page
rev 9506 : 8156563: JavaFX Ensemble8 media sample hang and crash
Reviewed-by: almatvee, kcr
*** 43,61 ****
CFLAGS += -Os
else
CFLAGS += -O0 -g -Wall
endif
-
INCLUDES = -I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/darwin \
-I$(SRCBASE_DIR) \
-I$(SRCBASE_DIR)/jni \
-I$(GENERATED_HEADERS_DIR)
!
! LDFLAGS = -mmacosx-version-min=10.7 \
-arch x86_64 \
-L$(BUILD_DIR) \
-lobjc \
-framework Cocoa \
-framework CoreVideo
--- 43,60 ----
CFLAGS += -Os
else
CFLAGS += -O0 -g -Wall
endif
INCLUDES = -I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/darwin \
-I$(SRCBASE_DIR) \
-I$(SRCBASE_DIR)/jni \
-I$(GENERATED_HEADERS_DIR)
! # We need to ensure everything builds with libc++, so add it here
! LDFLAGS = -stdlib=libc++ -mmacosx-version-min=10.7 \
-arch x86_64 \
-L$(BUILD_DIR) \
-lobjc \
-framework Cocoa \
-framework CoreVideo
*** 70,79 ****
--- 69,80 ----
-DGST_DISABLE_XML \
-DGSTREAMER_LITE \
-DJFXMEDIA_JNI_EXPORTS \
-DHAVE_CONFIG_H \
+ JFXMEDIA_CCFLAGS = -std=c++11 -stdlib=libc++ $(JFXMEDIA_CFLAGS)
+
JFXMEDIA_INCLUDES = $(INCLUDES) \
-I$(GLIB_LITE_DIR)/ \
-I$(GLIB_LITE_DIR)/glib \
-I$(GLIB_LITE_DIR)/gmodule \
-I$(GLIB_LITE_DIR)/build/osx \
*** 159,177 ****
# auto-dependencies
-include $(JFXMEDIA_OBJECTS:.o=.d)
$(OBJBASE_DIR)/%.o: %.cpp
@mkdir -p $(dir $@)
! $(CC) $(JFXMEDIA_CFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x c++ -c $< -o $@
$(OBJBASE_DIR)/%.o: %.c
@mkdir -p $(dir $@)
$(CC) $(JFXMEDIA_CFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x c -c $< -o $@
$(OBJBASE_DIR)/%.o: %.mm
@mkdir -p $(dir $@)
! $(CC) $(JFXMEDIA_CFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x objective-c++ -c $< -o $@
$(OBJBASE_DIR)/%.o: %.m
@mkdir -p $(dir $@)
$(CC) $(JFXMEDIA_CFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x objective-c -c $< -o $@
--- 160,178 ----
# auto-dependencies
-include $(JFXMEDIA_OBJECTS:.o=.d)
$(OBJBASE_DIR)/%.o: %.cpp
@mkdir -p $(dir $@)
! $(CC) $(JFXMEDIA_CCFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x c++ -c $< -o $@
$(OBJBASE_DIR)/%.o: %.c
@mkdir -p $(dir $@)
$(CC) $(JFXMEDIA_CFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x c -c $< -o $@
$(OBJBASE_DIR)/%.o: %.mm
@mkdir -p $(dir $@)
! $(CC) $(JFXMEDIA_CCFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x objective-c++ -c $< -o $@
$(OBJBASE_DIR)/%.o: %.m
@mkdir -p $(dir $@)
$(CC) $(JFXMEDIA_CFLAGS) $(JFXMEDIA_INCLUDES) -MD -MF $(OBJBASE_DIR)/$*.d -x objective-c -c $< -o $@
*** 192,206 ****
# The AVFoundation code uses ARC which is only supported by the clang compiler, so we'll
# force the use of clang for this module.
ifeq ($(COMPILE_PARFAIT), true)
# call xcrun so we wrap the correct clang++ executable
! CLANG_PATH = $(shell xcrun -find clang++)
AVF_CPP = parfait-clang++ --nativecxx "$(CLANG_PATH)"
else
! # add -l to show the full command line used to invoke clang++ (for debugging purposes)
! AVF_CPP = xcrun -l $(AVF_XCRUN_FLAGS) clang++
endif
AVF_OBJBASE = $(OBJBASE_DIR)/avf
# We need a full path to the right SDK
--- 193,206 ----
# The AVFoundation code uses ARC which is only supported by the clang compiler, so we'll
# force the use of clang for this module.
ifeq ($(COMPILE_PARFAIT), true)
# call xcrun so we wrap the correct clang++ executable
! CLANG_PATH := $(shell xcrun -find clang++)
AVF_CPP = parfait-clang++ --nativecxx "$(CLANG_PATH)"
else
! AVF_CPP := $(shell xcrun -find $(AVF_XCRUN_FLAGS) clang++)
endif
AVF_OBJBASE = $(OBJBASE_DIR)/avf
# We need a full path to the right SDK
*** 208,217 ****
--- 208,218 ----
AVF_SYSROOT = $(shell xcodebuild -sdk macosx -version | grep '^Path: ' | sed 's/Path: //')
# we have to remove -mmacosx-version-min=% from CFLAGS and LDFLAGS and set it to
# 10.8 since this module requires features only in 10.8 and later
AVF_LDFLAGS = $(filter-out -mmacosx-version-min=%, $(LDFLAGS)) \
+ -std=c++11 -stdlib=libc++ \
-isysroot "$(AVF_SYSROOT)" \
-iframework"$(AVF_SYSROOT)/System/Library/Frameworks" \
-mmacosx-version-min=10.8 \
-Wl,-install_name,@rpath/$(AVF_NAME) \
-framework AVFoundation \
*** 219,228 ****
--- 220,230 ----
-framework Accelerate \
-framework AudioUnit \
-framework MediaToolbox
AVF_CFLAGS = $(filter-out -mmacosx-version-min=%, $(CFLAGS)) \
+ -std=c++11 -stdlib=libc++ \
-isysroot "$(AVF_SYSROOT)" \
-iframework"$(AVF_SYSROOT)/System/Library/Frameworks" \
-mmacosx-version-min=10.8 \
-DCA_AU_USE_FAST_DISPATCH=1 \
-DCA_BASIC_AU_FEATURES=1 \
*** 287,296 ****
--- 289,299 ----
# ------------------------------------------------------------------
# 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
*** 298,307 ****
-include $(QTK_OBJECTS:.o=.d)
$(QTK_OBJBASE)/%.o: %.mm
@mkdir -p $(dir $@)
! $(CC) $(CFLAGS) $(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 $@
--- 301,310 ----
-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 $@
< prev index next >