FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fixes for GLES1, GLES2 and GL3

Browse Source
This commit is contained in:
Robert Osfield
2010-10-08 17:13:59 +00:00
parent 9984281553
commit 078b21fa1e
6 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/CMakeLists.txt
View File

@@ -40,7 +40,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
ADD_SUBDIRECTORY(osgfadetext)
ADD_SUBDIRECTORY(osgfont)
ADD_SUBDIRECTORY(osgforest)
ADD_SUBDIRECTORY(osgfpdepth)
ADD_SUBDIRECTORY(osgfxbrowser)
ADD_SUBDIRECTORY(osgoutline)
ADD_SUBDIRECTORY(osggameoflife)
@@ -151,6 +150,10 @@ IF(DYNAMIC_OPENSCENEGRAPH)
ADD_SUBDIRECTORY(osgmemorytest)
ENDIF()
IF(NOT OSG_GL3_AVAILABLE)
ADD_SUBDIRECTORY(osgfpdepth)
ENDIF()
IF(NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE)
ADD_SUBDIRECTORY(osgscreencapture)
ADD_SUBDIRECTORY(osgmotionblur)

3
examples/osgviewerQtContext/GraphicsWindowQt
View File

@@ -14,10 +14,11 @@
#ifndef OSGVIEWER_GRAPHICSWINDOWQT
#define OSGVIEWER_GRAPHICSWINDOWQT
#include <osgViewer/GraphicsWindow>
#include <QtGui/QWidget>
#include <QtGui/QInputEvent>
#include <QtOpenGL/QGLWidget>
#include <osgViewer/GraphicsWindow>
class GraphWidget : public QGLWidget
{