Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

properly support weak_linking AVKit when compiling under 10.9 + SDK, even when deployment can be lower, removing QTKit

Browse Source
This commit is contained in:
Stefan Csomor
2017-06-08 10:37:58 +02:00
parent 7453cfcbb6
commit 85a24fd4db
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/osx/wxcocoa.xcconfig
View File

@@ -9,4 +9,4 @@ GCC_VERSION =
ARCHS = i386 x86_64 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

2
configure vendored
View File

@@ -35447,7 +35447,7 @@ main ()
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : 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; } $as_echo "yes" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

2
configure.in
View File

@@ -7484,7 +7484,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
choke me choke me
#endif #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) AC_MSG_RESULT(no)
) )
CPPFLAGS="$old_CPPFLAGS" CPPFLAGS="$old_CPPFLAGS"

2
src/osx/cocoa/mediactrl.mm
View File

@@ -32,7 +32,7 @@
#include "wx/osx/private.h" #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 #define wxOSX_USE_AVKIT 1
#else #else
#define wxOSX_USE_AVKIT 0 #define wxOSX_USE_AVKIT 0