From 678ac9240925bfc9d9282b40709263340c60dc21 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 13 Apr 2006 13:30:21 +0000 Subject: [PATCH] Fixed bug #193 The attached patch is mostly cosmetic: Currently, we always add both -framework OpenGL and -framework AGL for Mac OS X command line builds. However, the former is only used for the Cocoa video driver, and the latter only for the Carbon video driver (as far as I can tell, at least). Hence the attached patch modifies configure.in so that each only gets added to the list of frameworks if the corresponding video driver is enabled. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401632 --- configure.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 5bf91e817..c6ec9fbb8 100644 --- a/configure.in +++ b/configure.in @@ -1444,9 +1444,12 @@ CheckMacGL() AC_DEFINE(SDL_VIDEO_OPENGL) case "$host" in *-*-darwin*) - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL" - # The following is probably not available in Darwin: - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AGL" + if test x$enable_video_cocoa = xyes; then + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL" + fi + if test x$enable_video_carbon = xyes; then + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AGL" + fi esac fi }