From 161809ef8c37ca56f0f9da55ce71e7bd25e94eb2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 3 Jul 2014 22:03:09 +0000 Subject: [PATCH] Still continue to use QuickTime framework in wxOSX/Carbon builds. Amend the changes of r76800 to only avoid QuickTime framework when using Cocoa, under Carbon it's needed by wxSound too, and not only wxMediaCtrl, and there is no real reason to avoid it in the first place anyhow. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 2 +- configure.in | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/configure b/configure index b4f82742e8..47c8f35d81 100755 --- a/configure +++ b/configure @@ -37087,7 +37087,7 @@ if test "$wxUSE_MAC" = 1 ; then else EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" - if test "$wxUSE_MEDIACTRL" = "yes"; then + if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_MEDIACTRL" = "yes"; then if test "$cross_compiling" != "no"; then wx_cv_target_x86_64=no diff --git a/configure.in b/configure.in index da9b7e7c1e..eb883bc206 100644 --- a/configure.in +++ b/configure.in @@ -7498,12 +7498,14 @@ if test "$wxUSE_MAC" = 1 ; then else EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" - dnl The case of QuickTime framework is special: we only need it in - dnl 32 bit builds and not in 64 bit and, moreover, linking with it - 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 + dnl The case of QuickTime framework is special: with Cocoa, we only + dnl need it in 32 bit builds and not in 64 bit and, moreover, + dnl linking with it in 64 bit builds results in a warning because + dnl the framework is not available in 64 bits itself. So make an + dnl effort to avoid using it unnecessarily. Note that with Carbon + dnl we also need it for wxSound an as Carbon is itself not + dnl available in 64 bits anyhow, there is no reason to avoid it. + if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_MEDIACTRL" = "yes"; then if test "$cross_compiling" != "no"; then dnl The check below doesn't work well when cross-compiling