[osg-users] OpenSceneGraph-3.4.0-rc6 tagged

[Terry Welsh]

Hi Robert,
Thanks for tackling the GLint/GLuint problem. I looked into it a
couple weeks ago but never discovered check_cxx_source_compiles or any
other solution.

One small issue: if your checks for GLint and GLuint fail, you get
these lines in include/osg/GL

#define GL_HEADER_HAS_GLINT64
#define GL_HEADER_HAS_GLUINT64

This causes errors because the code later in that file expects

#define GL_HEADER_HAS_GLINT64 0
#define GL_HEADER_HAS_GLUINT64 0

I fixed it by adding the following to CMakeLists.txt

@@ -593,6 +593,9 @@
     int main() { GLint64 test; return 0; }"
     GL_HEADER_HAS_GLINT64
 )
+IF(GL_HEADER_HAS_GLINT64 STREQUAL "")
+    SET(GL_HEADER_HAS_GLINT64 0)
+ENDIF()

 check_cxx_source_compiles(
     "${OPENGL_HEADER1}
@@ -600,6 +603,9 @@
     int main() { GLuint64 test; return 0; }"
     GL_HEADER_HAS_GLUINT64
 )
+IF(GL_HEADER_HAS_GLUINT64 STREQUAL "")
+    SET(GL_HEADER_HAS_GLUINT64 0)
+ENDIF()


--
Terry Welsh
http://www.reallyslick.com


>
> Message: 1
> Date: Wed, 22 Jul 2015 16:09:09 +0100
> From: Robert Osfield <robert.osfield at gmail.com>
> To: OpenSceneGraph Users <osg-users at lists.openscenegraph.org>
> Subject: [osg-users] OpenSceneGraph-3.4.0-rc6 tagged
> Message-ID:
>         <CAFN7Y+W1z+WOLYdNGtxSQtTZen4cgEC3H77n9Yqy1BnDXvmKjg at mail.gmail.com>
> Content-Type: text/plain; charset="utf-8"
>
> Hi All,
>
> I have done some CMake work on handling whether the GL header provides the
> GLuint64 and GLint64 typedefs which will hopefully help with address some
> of platform specfic build errors with certain GL/ES headers.
>
>    - Zip file containing source code : OpenSceneGraph-3.4.0-rc6.zip
>    <http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.4.0-rc6.zip>
>    - Subversion tag for 3.4.0-rc6 : svn co
>    http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.4.
>    <http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.4.0-rc6>0-rc6
>    OpenSceneGraph
>
> My plan is now to make 3.4.0 tomorrow.
>
> Thanks in advance for any testing you can do.
> Robert.