Commit 7dc358c7 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[FIX] - compiles in linux again.

parent 13e7d96d
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
#include <osg/State> #include <osg/State>
#include <osg/Vec3f> #include <osg/Vec3f>
#if defined ( __APPLE__ ) #if defined( __APPLE__ )
#include <OpenCL/cl.hpp> #include <OpenCL/cl.hpp>
#else #else
#include <CL/cl.hpp> #include <CL/cl.hpp> // NOTE: this header can be grabbed from http://www.khronos.org/registry/cl/. Its the c++ binding header.
#endif #endif
#include "../WExportWGE.h" #include "../WExportWGE.h"
...@@ -600,4 +600,4 @@ inline const WGERenderNodeCL* WGEModuleCL::getNode() const ...@@ -600,4 +600,4 @@ inline const WGERenderNodeCL* WGEModuleCL::getNode() const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#endif // WGEMODULECL_H #endif // WGEMODULECL_H
\ No newline at end of file
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#ifdef __linux__
#include <GL/glx.h>
#endif
#include <osg/BufferObject> #include <osg/BufferObject>
#include <osg/Program> #include <osg/Program>
#include <osg/Shader> #include <osg/Shader>
...@@ -818,4 +822,4 @@ void WGERenderNodeCL::draw( osg::State& state ) const ...@@ -818,4 +822,4 @@ void WGERenderNodeCL::draw( osg::State& state ) const
--m_count; --m_count;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <fstream>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <osg/notify> #include <osg/Notify>
#include "../../dataHandler/WGridRegular3D.h" #include "../../dataHandler/WGridRegular3D.h"
#include "../../dataHandler/WValueSet.h" #include "../../dataHandler/WValueSet.h"
...@@ -184,7 +186,7 @@ void WGlyphModule::setColoring( int mode ) ...@@ -184,7 +186,7 @@ void WGlyphModule::setColoring( int mode )
getNode()->setDeactivated( true ); getNode()->setDeactivated( true );
m_mode = mode; m_mode = mode;
changeCLData( ChangeCallback( this, ChangeCallback::SET_COLORING ) ); changeCLData( ChangeCallback( this, ChangeCallback::SET_COLORING ) );
getNode()->setDeactivated( false ); getNode()->setDeactivated( false );
...@@ -489,4 +491,4 @@ bool WGlyphModule::loadDataset( const CLViewData& viewData, CLObjects& objects ) ...@@ -489,4 +491,4 @@ bool WGlyphModule::loadDataset( const CLViewData& viewData, CLObjects& objects )
return false; return false;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment