Added an #ifdef to osgGLUT/Window.cpp to handle the case of compiling against

older versions of GLUT.

rundemos.bat

@@ -22,7 +22,7 @@ sgv spaceship.osg
 echo sgv cube_mapped_torus.osg
 sgv cube_mapped_torus.osg
 
-echo sgv osgvertexprogram
+echo osgvertexprogram
 osgvertexprogram
 
 echo sgv Town.osg

src/osgGLUT/Window.cpp

@@ -72,7 +72,9 @@ bool Window::open()
     glutVisibilityFunc( visibilityCB );
     glutDisplayFunc(    displayCB );
     glutKeyboardFunc(   keyboardCB );
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
     glutKeyboardUpFunc(   keyboardUpCB );
+#endif
 
     glutMouseFunc( mouseCB );
     glutMotionFunc( mouseMotionCB );

src/osgPlugins/lib3ds/ReaderWriter3DS.cpp

@@ -17,13 +17,13 @@
 #include <osg/NodeVisitor>
 
 
-#include <file.h>
-#include <mesh.h>
-#include <material.h>
-#include <vector.h>
-#include <matrix.h>
-#include <node.h>
-#include <quat.h>
+#include "file.h"
+#include "mesh.h"
+#include "material.h"
+#include "vector.h"
+#include "matrix.h"
+#include "node.h"
+#include "quat.h"
 
 #include <stdlib.h>
 #include <string.h>

src/osgPlugins/lib3ds/atmosphere.cpp

@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <atmosphere.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "atmosphere.h"
+#include "chunk.h"
+#include "readwrite.h"
 
 
 /*!

src/osgPlugins/lib3ds/atmosphere.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/background.cpp

@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <background.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "background.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <string.h>
 #include <math.h>
 

src/osgPlugins/lib3ds/background.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/camera.cpp

@@ -20,13 +20,13 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <camera.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "camera.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif

src/osgPlugins/lib3ds/camera.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/chunk.cpp

@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <chunk.h>
-#include <readwrite.h>
-#include <chunktable.h>
+#include "chunk.h"
+#include "readwrite.h"
+#include "chunktable.h"
 #include <string.h>
 #include <stdarg.h>
 

src/osgPlugins/lib3ds/chunk.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/chunktable.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_CHUNK_H
-#include <chunk.h>
+#include "chunk.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/ease.cpp

@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <ease.h>
+#include "ease.h"
 
 
 /*!

src/osgPlugins/lib3ds/ease.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/file.cpp

@@ -20,19 +20,19 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <file.h>
-#include <chunk.h>
-#include <readwrite.h>
-#include <material.h>
-#include <mesh.h>
-#include <camera.h>
-#include <light.h>
-#include <node.h>
-#include <vector.h>
+#include "file.h"
+#include "chunk.h"
+#include "readwrite.h"
+#include "material.h"
+#include "mesh.h"
+#include "camera.h"
+#include "light.h"
+#include "node.h"
+#include "vector.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif

src/osgPlugins/lib3ds/lib3ds_float.cpp

@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <lib3ds_float.h>
+#include "lib3ds_float.h"
 
 
 /*!

src/osgPlugins/lib3ds/lib3ds_float.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/light.cpp

@@ -20,13 +20,13 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <light.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "light.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif

src/osgPlugins/lib3ds/light.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/material.cpp

@@ -20,13 +20,13 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <material.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "material.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif

src/osgPlugins/lib3ds/material.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/matrix.cpp

@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <matrix.h>
-#include <quat.h>
-#include <vector.h>
+#include "matrix.h"
+#include "quat.h"
+#include "vector.h"
 #include <string.h>
 #include <math.h>
 

src/osgPlugins/lib3ds/matrix.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/mesh.cpp

@@ -20,15 +20,15 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <mesh.h>
-#include <readwrite.h>
-#include <chunk.h>
-#include <vector.h>
-#include <matrix.h>
+#include "mesh.h"
+#include "readwrite.h"
+#include "chunk.h"
+#include "vector.h"
+#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif

src/osgPlugins/lib3ds/mesh.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/node.cpp

@@ -20,15 +20,15 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <node.h>
-#include <file.h>
-#include <readwrite.h>
-#include <chunk.h>
-#include <matrix.h>
+#include "node.h"
+#include "file.h"
+#include "readwrite.h"
+#include "chunk.h"
+#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif

src/osgPlugins/lib3ds/node.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TRACKS_H
-#include <tracks.h>
+#include "tracks.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/quat.cpp

@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <quat.h>
+#include "quat.h"
 #include <math.h>
 
 

src/osgPlugins/lib3ds/quat.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/readwrite.cpp

@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <readwrite.h>
+#include "readwrite.h"
 
 
 /*!

src/osgPlugins/lib3ds/readwrite.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/shadow.cpp

@@ -23,7 +23,7 @@
 #include "shadow.h"
 #include "chunk.h"
 #include "readwrite.h"
-#include "math.h"
+#include <math.h>
 
 
 /*!

src/osgPlugins/lib3ds/shadow.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/tcb.cpp

@@ -20,8 +20,8 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <tcb.h>
-#include <readwrite.h>
+#include "tcb.h"
+#include "readwrite.h"
 #include <math.h>
 
 

src/osgPlugins/lib3ds/tcb.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/tracks.cpp

@@ -20,16 +20,16 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <tracks.h>
-#include <readwrite.h>
-#include <chunk.h>
-#include <lib3ds_float.h>
-#include <vector.h>
-#include <quat.h>
+#include "tracks.h"
+#include "readwrite.h"
+#include "chunk.h"
+#include "lib3ds_float.h"
+#include "vector.h"
+#include "quat.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif

src/osgPlugins/lib3ds/tracks.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TCB_H
-#include <tcb.h>
+#include "tcb.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/vector.cpp

@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <vector.h>
+#include "vector.h"
 #include <math.h>
 
 

src/osgPlugins/lib3ds/vector.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus

src/osgPlugins/lib3ds/viewport.cpp

@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <viewport.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "viewport.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <string.h>
 

src/osgPlugins/lib3ds/viewport.h

@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus