From f274e9abb3d47d61c4e5a2485efcc1efd90bcb2f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 29 Oct 2007 16:50:34 +0000 Subject: [PATCH] 2007-10-29 Emmanuele Bassi * configure.ac: * clutter/cogl/gl/cogl-defines.h.in: The OS X backend has a funny OpenGL header location, so it basically did break every application including clutter/cogl.h because the GL header inclusion depended on symbols defined into Clutter's config.h. Now, we define the GL header into the configure template and use it to create the cogl-defines.h file cogl.h includes. --- gl/{cogl-defines.h => cogl-defines.h.in} | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) rename gl/{cogl-defines.h => cogl-defines.h.in} (99%) diff --git a/gl/cogl-defines.h b/gl/cogl-defines.h.in similarity index 99% rename from gl/cogl-defines.h rename to gl/cogl-defines.h.in index 47fde3d73..a8fbdd3ec 100644 --- a/gl/cogl-defines.h +++ b/gl/cogl-defines.h.in @@ -33,11 +33,7 @@ #else -#if defined(HAVE_GL_GL_H) -#include -#elif defined(HAVE_OPENGL_GL_H) -#include -#endif +#include <@CLUTTER_GL_HEADER@> #endif /* WIN32 */