[Scummvm-cvs-logs] SF.net SVN: scummvm:[54722] scummvm/trunk/configure
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Dec 1 21:50:12 CET 2010
Revision: 54722
http://scummvm.svn.sourceforge.net/scummvm/?rev=54722&view=rev
Author: lordhoto
Date: 2010-12-01 20:50:12 +0000 (Wed, 01 Dec 2010)
Log Message:
-----------
CONFIGURE: Fix OpenGL library detection on OS X in case MESA is installed.
Modified Paths:
--------------
scummvm/trunk/configure
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2010-12-01 20:40:12 UTC (rev 54721)
+++ scummvm/trunk/configure 2010-12-01 20:50:12 UTC (rev 54722)
@@ -2666,10 +2666,14 @@
_opengl=no
# Try different library names
- # 1) GL This is usually used on POSIX systems
- # 2) opengl32 This is used on Windows
- # 3) -framework OpenGL This is used on Mac OS X
- for lib in "-lGL" "-lopengl32" "-framework OpenGL"; do
+ # 1) -framework OpenGL This is used on Mac OS X
+ # 2) GL This is usually used on POSIX systems
+ # 3) opengl32 This is used on Windows
+ #
+ # We try "-framework OpenGL" first here to assure it will always be
+ # picked up by the configure script on Mac OS X, even when a libGL
+ # exists.
+ for lib in "-framework OpenGL" "-lGL" "-lopengl32"; do
if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib
then
_opengl=yes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list