[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11106] branches/soc-2007-maike/extern: include change for GLEW integration
Miguel Torres Lima
torreslima at gmail.com
Thu Jun 28 19:25:00 CEST 2007
Revision: 11106
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11106
Author: maike
Date: 2007-06-28 19:25:00 +0200 (Thu, 28 Jun 2007)
Log Message:
-----------
include change for GLEW integration
Modified Paths:
--------------
branches/soc-2007-maike/extern/Makefile
branches/soc-2007-maike/extern/SConscript
branches/soc-2007-maike/extern/bFTGL/demo/FTGLDemo.cpp
branches/soc-2007-maike/extern/bFTGL/demo/tb.c
branches/soc-2007-maike/extern/bFTGL/include/FTGL.h
branches/soc-2007-maike/extern/bFTGL/test/demo.cpp
branches/soc-2007-maike/extern/ode/dist/drawstuff/src/drawstuff.cpp
branches/soc-2007-maike/extern/ode/dist/drawstuff/src/windows.cpp
branches/soc-2007-maike/extern/ode/dist/drawstuff/src/x11.cpp
branches/soc-2007-maike/extern/solid/examples/gldemo.cpp
branches/soc-2007-maike/extern/solid/examples/mnm.cpp
branches/soc-2007-maike/extern/solid/examples/physics.cpp
Modified: branches/soc-2007-maike/extern/Makefile
===================================================================
--- branches/soc-2007-maike/extern/Makefile 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/Makefile 2007-06-28 17:25:00 UTC (rev 11106)
@@ -33,7 +33,7 @@
SOURCEDIR = extern
DIR = $(OCGDIR)/extern
-DIRS = glew qhull/src solid
+DIRS = glew/src qhull/src solid
ifeq ($(WITH_FREETYPE2), true)
DIRS += bFTGL/src
Modified: branches/soc-2007-maike/extern/SConscript
===================================================================
--- branches/soc-2007-maike/extern/SConscript 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/SConscript 2007-06-28 17:25:00 UTC (rev 11106)
@@ -2,6 +2,8 @@
Import('env')
+SConscript(['glew/SConscript'])
+
if env['WITH_BF_GAMEENGINE']:
SConscript(['qhull/SConscript',
'solid/SConscript'])
Modified: branches/soc-2007-maike/extern/bFTGL/demo/FTGLDemo.cpp
===================================================================
--- branches/soc-2007-maike/extern/bFTGL/demo/FTGLDemo.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/bFTGL/demo/FTGLDemo.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -1,3 +1,5 @@
+#include <GL/glew.h>
+
#ifdef __APPLE_CC__
#include <GLUT/glut.h>
#else
Modified: branches/soc-2007-maike/extern/bFTGL/demo/tb.c
===================================================================
--- branches/soc-2007-maike/extern/bFTGL/demo/tb.c 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/bFTGL/demo/tb.c 2007-06-28 17:25:00 UTC (rev 11106)
@@ -8,6 +8,8 @@
/* includes */
#include <math.h>
#include <assert.h>
+#include <GL/glew.h>
+
#ifdef __APPLE_CC__
#include <GLUT/glut.h>
#else
Modified: branches/soc-2007-maike/extern/bFTGL/include/FTGL.h
===================================================================
--- branches/soc-2007-maike/extern/bFTGL/include/FTGL.h 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/bFTGL/include/FTGL.h 2007-06-28 17:25:00 UTC (rev 11106)
@@ -29,8 +29,7 @@
#include <windows.h>
#ifndef __gl_h_
- #include <GL/gl.h>
- #include <GL/glu.h>
+ #include <GL/glew.h>
#endif
#else
@@ -38,11 +37,9 @@
// Non windows platforms - don't require nonsense as seen above :-)
#ifndef __gl_h_
#ifdef __APPLE_CC__
- #include <OpenGL/gl.h>
- #include <OpenGL/glu.h>
+ #include <GL/glew.h>
#else
- #include <GL/gl.h>
- #include <GL/glu.h>
+ #include <GL/glew.h>
#endif
#endif
Modified: branches/soc-2007-maike/extern/bFTGL/test/demo.cpp
===================================================================
--- branches/soc-2007-maike/extern/bFTGL/test/demo.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/bFTGL/test/demo.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -3,6 +3,7 @@
#include <iostream>
#include <stdlib.h> // exit()
+#include <GL/glew.h>
#ifdef __APPLE_CC__
#include <GLUT/glut.h>
Modified: branches/soc-2007-maike/extern/ode/dist/drawstuff/src/drawstuff.cpp
===================================================================
--- branches/soc-2007-maike/extern/ode/dist/drawstuff/src/drawstuff.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/ode/dist/drawstuff/src/drawstuff.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -41,8 +41,7 @@
#endif
#include <ode/config.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <GL/glew.h>
#include "drawstuff/drawstuff.h"
#include "internal.h"
Modified: branches/soc-2007-maike/extern/ode/dist/drawstuff/src/windows.cpp
===================================================================
--- branches/soc-2007-maike/extern/ode/dist/drawstuff/src/windows.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/ode/dist/drawstuff/src/windows.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -24,7 +24,7 @@
#include <windows.h>
#endif
#include <ode/config.h>
-#include <GL/gl.h>
+#include <GL/glew.h>
#include "resource.h"
#include "internal.h"
Modified: branches/soc-2007-maike/extern/ode/dist/drawstuff/src/x11.cpp
===================================================================
--- branches/soc-2007-maike/extern/ode/dist/drawstuff/src/x11.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/ode/dist/drawstuff/src/x11.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -29,6 +29,7 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
+#include <GL/glew.h>
#include <GL/glx.h>
#include <drawstuff/drawstuff.h>
Modified: branches/soc-2007-maike/extern/solid/examples/gldemo.cpp
===================================================================
--- branches/soc-2007-maike/extern/solid/examples/gldemo.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/solid/examples/gldemo.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -21,6 +21,7 @@
* use of this library.
*/
+#include <GL/glew.h>
#include <GL/glut.h>
#include <SOLID.h>
Modified: branches/soc-2007-maike/extern/solid/examples/mnm.cpp
===================================================================
--- branches/soc-2007-maike/extern/solid/examples/mnm.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/solid/examples/mnm.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -29,6 +29,7 @@
//#define DRAW_COORD
#include <new>
+#include <GL/glew.h>
#include <GL/glut.h>
#include "GEN_MinMax.h"
Modified: branches/soc-2007-maike/extern/solid/examples/physics.cpp
===================================================================
--- branches/soc-2007-maike/extern/solid/examples/physics.cpp 2007-06-28 17:23:43 UTC (rev 11105)
+++ branches/soc-2007-maike/extern/solid/examples/physics.cpp 2007-06-28 17:25:00 UTC (rev 11106)
@@ -28,6 +28,7 @@
//#define USE_QUADS // Idem, but now with quads
#include <new>
+#include <GL/glew.h>
#include <GL/glut.h>
#include "GEN_MinMax.h"
More information about the Bf-blender-cvs
mailing list