SF.net SVN: openvrml:[3829] trunk

[<br...@us...>]

Revision: 3829
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3829&view=rev
Author:   braden
Date:     2009-03-15 18:51:39 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Use the conventional gl.h/glu.h header paths as a first choice.  Make it up to users who don't want these to make them unavailable to the build environment.  Most of the time, that will be done by configuring --without-x.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-15 18:33:14 UTC (rev 3828)
+++ trunk/ChangeLog	2009-03-15 18:51:39 UTC (rev 3829)
@@ -1,3 +1,11 @@
+2009-03-15 Braden McDaniel  <br...@en...>
+
+	* src/libopenvrml-gl/openvrml/gl/viewer.cpp: Use the conventional
+	gl.h/glu.h header paths as a first choice.  Make it up to users
+	who don't want these to make them unavailable to the build
+	environment.  Most of the time, that will be done by configuring
+	--without-x.
+
 2009-03-04 Braden McDaniel  <br...@en...>
 
 	Moved the parser instances out of browser.cpp along with a lot of


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801

Modified: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2009-03-15 18:33:14 UTC (rev 3828)
+++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2009-03-15 18:51:39 UTC (rev 3829)
@@ -36,12 +36,14 @@
 #   undef interface
 # endif
 
-# ifdef HAVE_OPENGL_GL_H
+# ifdef HAVE_GL_GLU_H
+#   include <GL/gl.h>
+#   include <GL/glu.h>
+# elif defined(HAVE_OPENGL_GLU_H)
 #   include <OpenGL/gl.h>
 #   include <OpenGL/glu.h>
 # else
-#   include <GL/gl.h>
-#   include <GL/glu.h>
+#   error must define HAVE_GL_GLU_H or HAVE_OPENGL_GLU_H
 # endif
 
 # include <cmath>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.