AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't link with QuickTime framework unnecessarily under OS X.

Browse Source 
Only use QuickTime when wxUSE_MEDIACTRL is true.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-06-30 12:02:33 +00:00
parent c3405487bb
commit 2cceb4dbc3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -37087,6 +37087,7 @@ if test "$wxUSE_MAC" = 1 ; then
else
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System"
if test "$wxUSE_MEDIACTRL" = "yes"; then
if test "$cross_compiling" != "no"; then
wx_cv_target_x86_64=no
@ -37119,6 +37120,8 @@ $as_echo "$wx_cv_target_x86_64" >&6; }
if test "$wx_cv_target_x86_64" != "yes"; then
EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
fi
fi
fi
fi
fi

3
configure.in
View File

@ -7503,6 +7503,7 @@ if test "$wxUSE_MAC" = 1 ; then
dnl in 64 bit builds results in a warning because the framework is
dnl not available in 64 bits itself. So make an effort to avoid it
dnl when building for 64 bits only (i.e. not universal build).
if test "$wxUSE_MEDIACTRL" = "yes"; then
if test "$cross_compiling" != "no"; then
dnl The check below doesn't work well when cross-compiling
@ -7529,6 +7530,8 @@ if test "$wxUSE_MAC" = 1 ; then
if test "$wx_cv_target_x86_64" != "yes"; then
EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
fi
fi
fi
fi
fi