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

Don't link with OpenGL framework unconditionally under Mac OS X.

Browse Source 
"-framework OpenGL" is already added when wxUSE_OPENGL is true, there is no
need to always include it.

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

2
configure vendored
View File

@ -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 -framework OpenGL"
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System"
if test "$cross_compiling" != "no"; then

2
configure.in
View File

@ -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 -framework OpenGL"
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System"
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