Changeset 1408

Timestamp:

08/01/08 11:17:57 (4 months ago)

Author:

timdewhirst

Message:

opl
- ensure guards are correct for case when GLEW is not present

Location:

trunk/src/openpluginlib/pl

Files:

• bind_info.cpp (modified) (1 diff)
• shader_manager.hpp (modified) (2 diffs)
• timer.hpp (modified) (3 diffs)

trunk/src/openpluginlib/pl/bind_info.cpp

@@ -6 +6 @@
 // For more information, see http://www.openlibraries.org.
 
-#include <GL/glew.h>
-
 #include <openpluginlib/pl/bind_info.hpp>
 
 #ifdef HAVE_GL_GLEW_H
+
+#include <GL/glew.h>
 
 namespace olib { namespace openpluginlib {

trunk/src/openpluginlib/pl/shader_manager.hpp

@@ -23 +23 @@
 #include <boost/shared_ptr.hpp>
 
+#include <openpluginlib/pl/config.hpp>
+#include <openpluginlib/pl/property.hpp>
+
+#ifdef HAVE_GL_GLEW_H
+
 #include <GL/glew.h>
 
@@ -30 +35 @@
 #endif
 
-#include <openpluginlib/pl/config.hpp>
-#include <openpluginlib/pl/property.hpp>
-
-#ifdef HAVE_GL_GLEW_H
 
 namespace olib { namespace openpluginlib {

trunk/src/openpluginlib/pl/timer.hpp

@@ -26 +26 @@
 #endif
 
-#include <GL/glew.h>
-
 #include <openpluginlib/pl/config.hpp>
 
@@ -294 +292 @@
 #endif
 
+#ifdef HAVE_GL_GLEW_H
+
+#include <GL/glew.h>
+
 #ifdef GL_EXT_timer_query
 class OPENPLUGINLIB_DECLSPEC gpu_
@@ -316 +318 @@
         GLuint id_;
 };
-#endif
+#endif // GL_EXT_timer_query
+#endif // HAVE_GL_GLEW_H
 
 template<class timer_policy>