Changeset 1410

Timestamp:

08/01/08 11:26:41 (4 months ago)

Author:

timdewhirst

Message:

oal
- ensure dependency on ool is not enforced if GLEW is not available

Location:

trunk/src/openassetlib/al

Files:

• al.cpp (modified) (1 diff)
• al.hpp (modified) (3 diffs)

trunk/src/openassetlib/al/al.cpp

@@ -713 +713 @@
                 }
 
+#ifdef HAVE_GL_GLEW_H
                 AL_DECLSPEC ool::sg::scene_ptr convert_to_object(asset_ptr)
                 {
                         return ool::sg::scene_ptr();
                 }
+#endif
 
                 AL_DECLSPEC bool store_image(asset_ptr asset, oil::il::image_type_ptr image, const opl::string& image_property_name_prefix)

trunk/src/openassetlib/al/al.hpp

@@ -17 +17 @@
 #include <openmedialib/ml/ml.hpp>
 #include <openmedialib/ml/openmedialib_plugin.hpp>
+#include <openassetlib/al/config.hpp>
+#include <openassetlib/al/al_plugin.hpp>
+
+#ifdef HAVE_GL_GLEW_H
 #include <openobjectlib/sg/sg.hpp>
 #include <openobjectlib/sg/openobjectlib_plugin.hpp>
-#include <openassetlib/al/config.hpp>
-#include <openassetlib/al/al_plugin.hpp>
+#endif
 
 #ifdef _MSC_VER
@@ -30 +33 @@
 namespace oil = olib::openimagelib;
 namespace oml = olib::openmedialib;
+#ifdef HAVE_GL_GLEW_H
 namespace ool = olib::openobjectlib;
+#endif
 
 namespace olib { namespace openassetlib {
@@ -102 +107 @@
                 AL_DECLSPEC oil::il::image_type_ptr convert_to_image(asset_ptr);
                 AL_DECLSPEC oml::ml::input_type_ptr convert_to_media(asset_ptr);
+#ifdef HAVE_GL_GLEW_H
                 AL_DECLSPEC ool::sg::scene_ptr      convert_to_object(asset_ptr);
+#endif 
 
                 /////////////////////////////////////////////////////////////////////////////