[Boost-commit] svn:boost r47519 - in sandbox/SOC/2007/signals/libs/glv: . include src

From: stipe_at_[hidden]
Date: 2008-07-17 18:30:47

Author: srajko
Date: 2008-07-17 18:30:47 EDT (Thu, 17 Jul 2008)
New Revision: 47519
URL: http://svn.boost.org/trac/boost/changeset/47519

Log:
glv builds on MSVC8
Text files modified: 
   sandbox/SOC/2007/signals/libs/glv/Jamfile                    |     2 ++                                      
   sandbox/SOC/2007/signals/libs/glv/include/glv_binding_glut.h |     2 +-                                      
   sandbox/SOC/2007/signals/libs/glv/include/glv_draw.h         |     2 +-                                      
   sandbox/SOC/2007/signals/libs/glv/src/glv_binding_glut.cpp   |     2 +-                                      
   4 files changed, 5 insertions(+), 3 deletions(-)

Modified: sandbox/SOC/2007/signals/libs/glv/Jamfile
==============================================================================
--- sandbox/SOC/2007/signals/libs/glv/Jamfile	(original)
+++ sandbox/SOC/2007/signals/libs/glv/Jamfile	2008-07-17 18:30:47 EDT (Thu, 17 Jul 2008)
@@ -29,8 +29,10 @@
         <toolset>gcc:<library>pthread
         <toolset>gcc:<library>Xv
         <toolset>gcc:<library>Xext
+        <toolset>msvc:<define>WIN32
     : requirements
         <include>include
+        <toolset>msvc:<define>WIN32
     ;
 
 SOURCES = glv_abstract_binding glv_color glv_core glv_draw glv_glv

Modified: sandbox/SOC/2007/signals/libs/glv/include/glv_binding_glut.h
==============================================================================
--- sandbox/SOC/2007/signals/libs/glv/include/glv_binding_glut.h	(original)
+++ sandbox/SOC/2007/signals/libs/glv/include/glv_binding_glut.h	2008-07-17 18:30:47 EDT (Thu, 17 Jul 2008)
@@ -14,7 +14,7 @@
         #include <GL/glut.h>
 #endif
 #ifdef WIN32
-	#include <?/glut.h>
+	#include <GL/glut.h>
 #endif
 
 namespace glv {

Modified: sandbox/SOC/2007/signals/libs/glv/include/glv_draw.h
==============================================================================
--- sandbox/SOC/2007/signals/libs/glv/include/glv_draw.h	(original)
+++ sandbox/SOC/2007/signals/libs/glv/include/glv_draw.h	2008-07-17 18:30:47 EDT (Thu, 17 Jul 2008)
@@ -260,7 +260,7 @@
 inline void translateZ(float z){ translate(0, 0, z); }
 
 template <class T>
-void vertexY(T * ys, unsigned long len, T xInc=1, int prim = LineStrip){
+void vertexY(T * ys, unsigned long len, T xInc, int prim){
         begin(prim);
         for(unsigned long i=0; i<len; ++i) vertex((float)(xInc * i), (float)ys[i]);
         end();

Modified: sandbox/SOC/2007/signals/libs/glv/src/glv_binding_glut.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/glv/src/glv_binding_glut.cpp	(original)
+++ sandbox/SOC/2007/signals/libs/glv/src/glv_binding_glut.cpp	2008-07-17 18:30:47 EDT (Thu, 17 Jul 2008)
@@ -121,7 +121,7 @@
 : AbstractWindow(width, height, title, glv, framerate)
 {
         int argc = 0;
-	char * argv[] = {};
+	char * argv[] = {0};
         if(singletonWindow == NULL){
                 glutInit(&argc,argv);
                 glutInitWindowSize(width,height);