[Boost-commit] svn:boost r49368 - in sandbox/guigl: boost/guigl/platform libs/guigl/src

Subject: [Boost-commit] svn:boost r49368 - in sandbox/guigl: boost/guigl/platform libs/guigl/src
From: stipe_at_[hidden]
Date: 2008-10-16 19:40:12

Author: srajko
Date: 2008-10-16 19:40:11 EDT (Thu, 16 Oct 2008)
New Revision: 49368
URL: http://svn.boost.org/trac/boost/changeset/49368

Log:
possible to build using FLTK's GLUT
Text files modified: 
   sandbox/guigl/boost/guigl/platform/glut.hpp |     6 +++++-                                  
   sandbox/guigl/libs/guigl/src/window.cpp     |     7 ++++++-                                 
   2 files changed, 11 insertions(+), 2 deletions(-)

Modified: sandbox/guigl/boost/guigl/platform/glut.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/platform/glut.hpp	(original)
+++ sandbox/guigl/boost/guigl/platform/glut.hpp	2008-10-16 19:40:11 EDT (Thu, 16 Oct 2008)
@@ -6,7 +6,11 @@
     http://www.boost.org/LICENSE_1_0.txt)
 -----------------------------------------------===============================*/
 
-#ifdef __APPLE__
+#if defined(BOOST_GUIGL_USE_FLTK_GLUT)
+
+#include <Fl/glut.H>
+
+#elif defined(__APPLE__)
 
 #include <GLUT/glut.h>
 

Modified: sandbox/guigl/libs/guigl/src/window.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/window.cpp	(original)
+++ sandbox/guigl/libs/guigl/src/window.cpp	2008-10-16 19:40:11 EDT (Thu, 16 Oct 2008)
@@ -23,14 +23,19 @@
     glut()
     {
         int argc = 0;
-        glutInit(&argc,0);
+        char *argv;
+        glutInit(&argc,&argv);
     }
     
     int create_window(const size_type &size, const std::string &label, bool depth, window::impl *impl)
     {
         glutInitWindowSize((int)size.x, (int)size.y);
         glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_ALPHA | (depth?GLUT_DEPTH:0));
+#if defined(BOOST_GUIGL_USE_FLTK_GLUT)
+        int id = glutCreateWindow(const_cast<char *>(label.c_str()));
+#else
         int id = glutCreateWindow(label.c_str());
+#endif
         if(depth)
             glEnable(GL_DEPTH_TEST);
         else