[Scummvm-devel] [Scummvm-cvs-logs] SF.net SVN: scummvm:[51676] scummvm/branches/gsoc2010-opengl/configure

[Joost Peters]

Hi Alejandro,

The OpenGL detection currently fails on Mac OS X.

Besides that __MACOSX__ is not a built-in define (__APPLE__ would be, 
but it's probably also set on e.g. iPhone, so not a good choice), the 
correct include to use is <OpenGL/gl.h>.

Actually, I'm not sure if detection is even necessary on OS X.  AFAIK 
OpenGL is always present, though you would still want to be able to 
disable it with --disable-opengl.

Cheers,
Joost


vgvgf at users.sourceforge.net wrote:
> Revision: 51676
>           http://scummvm.svn.sourceforge.net/scummvm/?rev=51676&view=rev
> Author:   vgvgf
> Date:     2010-08-03 03:14:35 +0000 (Tue, 03 Aug 2010)
> 
> Log Message:
> -----------
> OPENGL: Add basic configure detection.
> 
> Modified Paths:
> --------------
>     scummvm/branches/gsoc2010-opengl/configure
> 
> Modified: scummvm/branches/gsoc2010-opengl/configure
> ===================================================================
> --- scummvm/branches/gsoc2010-opengl/configure	2010-08-03 02:30:36 UTC (rev 51675)
> +++ scummvm/branches/gsoc2010-opengl/configure	2010-08-03 03:14:35 UTC (rev 51676)
> @@ -2310,13 +2310,23 @@
>  #
>  # Check for OpenGL (ES)
>  #
> +
>  echocheck "OpenGL (ES)"
>  if test "$_opengl" = auto ; then
> -# TODO: This is just a quick hack until actual detection is added, which
> -# will be a pain because of the various directories that OpenGL can have
> -# its headers in. Maybe we should force the platforms to automatically
> -# include the directory that includes gl.h?
> -	_opengl=yes
> +	_opengl=no
> +	cat > $TMPC << EOF
> +#if defined(__MACOSX__)
> +#include <gl.h>
> +#else
> +#if defined(__WIN32__)
> +#define WIN32_LEAN_AND_MEAN
> +#include <windows.h>
> +#endif
> +#include <GL/gl.h>
> +#endif
> +int main(void) { return GL_VERSION_1_1; }
> +EOF
> +	cc_check $OPENGL_CFLAGS $OPENGL_LIBS && _opengl=yes
>  fi
>  if test "$_opengl" = yes ; then
>  	_def_opengl='#define USE_OPENGL'
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> The Palm PDK Hot Apps Program offers developers who use the
> Plug-In Development Kit to bring their C/C++ apps to Palm for a share
> of $1 Million in cash or HP Products. Visit us here for more details:
> http://p.sf.net/sfu/dev2dev-palm
> _______________________________________________
> Scummvm-cvs-logs mailing list
> Scummvm-cvs-logs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-cvs-logs