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

From: stipe_at_[hidden]
Date: 2008-07-18 18:13:28

Author: srajko
Date: 2008-07-18 18:13:27 EDT (Fri, 18 Jul 2008)
New Revision: 47582
URL: http://svn.boost.org/trac/boost/changeset/47582

Log:
dataflow examples build with mingw
Text files modified: 
   sandbox/SOC/2007/signals/libs/glv/Jamfile            |    25 ++++++++++++++++---------               
   sandbox/SOC/2007/signals/libs/glv/include/glv_conf.h |     4 ++--                                    
   sandbox/SOC/2007/signals/libs/glv/include/glv_draw.h |     4 ++--                                    
   3 files changed, 20 insertions(+), 13 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-18 18:13:27 EDT (Fri, 18 Jul 2008)
@@ -3,6 +3,8 @@
 # accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
+import os ;
+
 lib glut : : <name>glut ;
 lib openGL : : <name>GL ;
 lib openGLU : : <name>GLU ;
@@ -13,6 +15,19 @@
 lib X11-xcb : : <name>X11-xcb ;
 lib pthread : : <name>pthread ;
 
+lib mingw_glut : : <name>glut32 ;
+lib mingw_openGL : : <name>opengl32 ;
+lib mingw_openGLU : : <name>glu32 ;
+
+if [ os.name ] = NT
+{
+    GLlibraries = mingw_openGL mingw_openGLU mingw_glut ;
+}
+else
+{
+    GLlibraries = glut openGL openGLU X11 Xaw Xv Xext X11-xcb pthread ;
+}
+
 project dataflow/example/glv
     : source-location src
     : usage-requirements
@@ -20,15 +35,7 @@
         <toolset>darwin:<linkflags>"-framework AGL"
         <toolset>darwin:<linkflags>"-framework GLUT"
         <toolset>darwin:<linkflags>"-framework OpenGL"
-        <toolset>gcc:<library>glut
-        <toolset>gcc:<library>openGL
-        <toolset>gcc:<library>openGLU
-        <toolset>gcc:<library>X11-xcb
-        <toolset>gcc:<library>X11
-        <toolset>gcc:<library>Xaw
-        <toolset>gcc:<library>pthread
-        <toolset>gcc:<library>Xv
-        <toolset>gcc:<library>Xext
+        <toolset>gcc:<library>$(GLlibraries)
         <toolset>msvc:<define>WIN32
     : requirements
         <include>include

Modified: sandbox/SOC/2007/signals/libs/glv/include/glv_conf.h
==============================================================================
--- sandbox/SOC/2007/signals/libs/glv/include/glv_conf.h	(original)
+++ sandbox/SOC/2007/signals/libs/glv/include/glv_conf.h	2008-07-18 18:13:27 EDT (Fri, 18 Jul 2008)
@@ -57,8 +57,8 @@
 #endif
 
 #ifdef WIN32
-	
-	#define GLV_PLATFORM		"WIN32"
+
+    #define GLV_PLATFORM		"WIN32"
 
         #include <windows.h>
 

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-18 18:13:27 EDT (Fri, 18 Jul 2008)
@@ -313,13 +313,13 @@
 
 
 template <class T>
-void push3D(T w, T h, T near, T far){
+void push3D(T w, T h, T znear, T zfar){
         //pushAttrib(DepthBufferBit);
         pushAttrib(ColorBufferBit | DepthBufferBit | EnableBit);
         enable(DepthTest);
         
         push(Projection); identity();
-		gluPerspective(45, w/(GLfloat)h, near, far);
+		gluPerspective(45, w/(GLfloat)h, znear, zfar);
         
         push(Model); identity();
                 translate(0, 0, -2.42);