From e154a0a308f97ef0c74f568601634e3dd453e908 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 3 Jul 2014 09:57:40 +0000 Subject: [PATCH] Revert "Don't link with OpenGL framework unconditionally under Mac OS X." OpenGL framework is, in fact, always needed because of the code in src/osx/core/glgrab.cpp which is currently used to implement wxScreenDC::GetAsBitmap(). This reverts r76799. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9a25fc981f..b4f82742e8 100755 --- a/configure +++ b/configure @@ -37085,7 +37085,7 @@ if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_OSX_IPHONE" = 1; then EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore" else - EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System" + EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" if test "$wxUSE_MEDIACTRL" = "yes"; then diff --git a/configure.in b/configure.in index f98206377f..da9b7e7c1e 100644 --- a/configure.in +++ b/configure.in @@ -7496,7 +7496,7 @@ if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_OSX_IPHONE" = 1; then EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore" else - EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System" + 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