diff --git a/build/osx/wxcocoa.xcconfig b/build/osx/wxcocoa.xcconfig index 4ea8ea100c..a2d5082ab9 100644 --- a/build/osx/wxcocoa.xcconfig +++ b/build/osx/wxcocoa.xcconfig @@ -9,4 +9,4 @@ GCC_VERSION = ARCHS = i386 x86_64 -OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework OpenGL -framework AVFoundation -framework CoreMedia -framework QTKit -framework Security +OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework OpenGL -framework AVFoundation -framework CoreMedia -framework Security -weak_framework AVKit diff --git a/configure b/configure index c175e2c527..5c3a076d84 100755 --- a/configure +++ b/configure @@ -35447,7 +35447,7 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - GST_LIBS="$GST_LIBS -framework AVKit"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + GST_LIBS="$GST_LIBS -weak_framework AVKit"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 diff --git a/configure.in b/configure.in index b148aca6d9..829d1d23ba 100644 --- a/configure.in +++ b/configure.in @@ -7484,7 +7484,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then choke me #endif ], - [GST_LIBS="$GST_LIBS -framework AVKit"; AC_MSG_RESULT(yes)], + [GST_LIBS="$GST_LIBS -weak_framework AVKit"; AC_MSG_RESULT(yes)], AC_MSG_RESULT(no) ) CPPFLAGS="$old_CPPFLAGS" diff --git a/src/osx/cocoa/mediactrl.mm b/src/osx/cocoa/mediactrl.mm index 255b991247..4a1da75770 100644 --- a/src/osx/cocoa/mediactrl.mm +++ b/src/osx/cocoa/mediactrl.mm @@ -32,7 +32,7 @@ #include "wx/osx/private.h" -#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 #define wxOSX_USE_AVKIT 1 #else #define wxOSX_USE_AVKIT 0