From b90bbdaebf5f1f702dfadf64f2a97e631be5b070 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 23 Jul 2015 07:39:12 +0000 Subject: [PATCH] Changed the GL_HEADER_HAS_GLINT64 and GL_HEADER_HAS_GLUINT64 to use cmakedefine to improve handling of when cmake doesn't find GLint64 and GLuint64. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15013 16af8721-9629-0410-8352-f15c8da7e697 --- src/osg/GL.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/osg/GL.in b/src/osg/GL.in index cc87a2577..5ade5ed3a 100644 --- a/src/osg/GL.in +++ b/src/osg/GL.in @@ -29,6 +29,8 @@ #cmakedefine OSG_GL_VERTEX_FUNCS_AVAILABLE #cmakedefine OSG_GL_VERTEX_ARRAY_FUNCS_AVAILABLE #cmakedefine OSG_GL_FIXED_FUNCTION_AVAILABLE +#cmakedefine GL_HEADER_HAS_GLINT64 +#cmakedefine GL_HEADER_HAS_GLUINT64 #define OSG_GL1_FEATURES @OSG_GL1_FEATURES@ #define OSG_GL2_FEATURES @OSG_GL2_FEATURES@ @@ -36,8 +38,7 @@ #define OSG_GLES1_FEATURES @OSG_GLES1_FEATURES@ #define OSG_GLES2_FEATURES @OSG_GLES2_FEATURES@ #define OSG_GLES3_FEATURES @OSG_GLES3_FEATURES@ -#define GL_HEADER_HAS_GLINT64 @GL_HEADER_HAS_GLINT64@ -#define GL_HEADER_HAS_GLUINT64 @GL_HEADER_HAS_GLUINT64@ + #ifndef WIN32 @@ -117,7 +118,7 @@ #endif // GL_APIENTRY -#if !GL_HEADER_HAS_GLINT64 +#ifndef GL_HEADER_HAS_GLINT64 #ifdef _WIN32 typedef __int64 GLint64; #else @@ -125,7 +126,7 @@ #endif #endif -#if !GL_HEADER_HAS_GLUINT64 +#ifndef GL_HEADER_HAS_GLUINT64 #ifdef _WIN32 typedef unsigned __int64 GLuint64; #else