From 80363d2ff02b9c519dcc2f721ba66b9dfab5e574 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 23 May 2012 08:50:03 +0000 Subject: [PATCH] added to these two gl-related files the system independent inclusion of GLU. IT is necessary since the last version of QT does not include anymore glu when including QGL stuff --- wrap/gl/glu_tesselator.h | 13 +++++++++++++ wrap/gl/picking.h | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/wrap/gl/glu_tesselator.h b/wrap/gl/glu_tesselator.h index e9f83ea7..9de33502 100644 --- a/wrap/gl/glu_tesselator.h +++ b/wrap/gl/glu_tesselator.h @@ -29,6 +29,19 @@ #error "Please include OpenGL before including this file" #endif + +// The inclusion of glu should be always safe (if someone has already included gl stuff). +#ifndef GLU_VERSIONS +#ifdef __APPLE__ +#include +#else +#ifdef _WIN32 + #include +#endif +#include +#endif +#endif + #ifndef CALLBACK #ifdef _WIN32 #define CALLBACK __stdcall diff --git a/wrap/gl/picking.h b/wrap/gl/picking.h index 77007497..c1581b34 100644 --- a/wrap/gl/picking.h +++ b/wrap/gl/picking.h @@ -50,6 +50,18 @@ Revision 1.1 2005/12/03 09:36:28 ganovelli #define WRAP_GL_PICKING_H #include + +#ifndef GLU_VERSIONS +#ifdef __APPLE__ +#include +#else +#ifdef _WIN32 + #include +#endif +#include +#endif +#endif + namespace vcg {