From e05ca77bf51795c4062575ca30e4bc635d7c2238 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 2 Jul 2014 12:06:14 +0000 Subject: [PATCH] Don't link with QuickTime framework unnecessarily under OS X. Only use QuickTime when wxUSE_MEDIACTRL is true. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 3 +++ configure.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index c7291e206a..2d2241864e 100755 --- a/configure +++ b/configure @@ -37466,6 +37466,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 "$cross_compiling" != "no"; then wx_cv_target_x86_64=no @@ -37498,6 +37499,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 diff --git a/configure.in b/configure.in index 8748863a62..0c273c6533 100644 --- a/configure.in +++ b/configure.in @@ -7721,6 +7721,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 @@ -7747,6 +7748,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