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

Fix AVKit availability check for OS X SDK 10.7 and 10.8

Browse Source 
This fixes the check for older SDKs and outputs the check result.

This is a follow up to https://github.com/wxWidgets/wxWidgets/pull/337 and the
improvement of https://github.com/wxWidgets/wxWidgets/pull/342.

Closes https://github.com/wxWidgets/wxWidgets/pull/370
This commit is contained in:
Tobias Taschner
2016-12-12 14:24:02 +01:00
committed by Vadim Zeitlin
parent 4a83fd4696
commit 159186d656
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@@ -35277,8 +35277,8 @@ fi
if test "$wxUSE_OSX_IPHONE" != 1; then if test "$wxUSE_OSX_IPHONE" != 1; then
old_CPPFLAGS="$CPPFLAGS" old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-x objective-c++ $CPPFLAGS" CPPFLAGS="-x objective-c++ $CPPFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if AVKit is availble" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AVKit is available" >&5
$as_echo_n "checking if AVKit is availble... " >&6; } $as_echo_n "checking if AVKit is available... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "AvailabilityMacros.h" #include "AvailabilityMacros.h"
@@ -35286,7 +35286,7 @@ int
main () main ()
{ {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
// AVKit available // AVKit available
#else #else
choke me choke me
@@ -35297,7 +35297,11 @@ 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" GST_LIBS="$GST_LIBS -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
$as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7
configure.in
View File

@@ -7413,17 +7413,18 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
dnl AVKit is only available since OS X 10.9 dnl AVKit is only available since OS X 10.9
old_CPPFLAGS="$CPPFLAGS" old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-x objective-c++ $CPPFLAGS" CPPFLAGS="-x objective-c++ $CPPFLAGS"
AC_MSG_CHECKING([if AVKit is availble]) AC_MSG_CHECKING([if AVKit is available])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include "AvailabilityMacros.h"], [#include "AvailabilityMacros.h"],
[ [
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
// AVKit available // AVKit available
#else #else
choke me choke me
#endif #endif
], ],
GST_LIBS="$GST_LIBS -framework AVKit" [GST_LIBS="$GST_LIBS -framework AVKit"; AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no)
) )
CPPFLAGS="$old_CPPFLAGS" CPPFLAGS="$old_CPPFLAGS"
fi fi