Hi Jan, I have just reviewed your changes and have merged the GL header change, but find your GraphicsWindowQt.cpp the same as the one in svn/trunk. Any chance you have sent the wrong file?
Robert. On 14 June 2013 15:02, Jan Ciger <[email protected]> wrote: > Hello, > > I have found a problem when building OSG with Qt 5 support. Qt has the > following in the qopengl.h header: > > # include <QtGui/qopengles2ext.h> > # ifndef GL_DOUBLE > # define GL_DOUBLE GL_FLOAT > # endif > # ifndef GLdouble > typedef GLfloat GLdouble; > # endif > > Unfortunately, when building for normal OpenGL (not GL/ES!) on Windows > with MSVC2012, GLdouble is not defined (it is not a macro but typedef) > and the code above produces a conflicting definition, making the > compile fail. I am attaching a bit hackish workaround for this problem > in osg/GL and reordering of #includes in GraphicsWindowQt.cpp. > > Regards, > > Jan > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
