[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11108] branches/soc-2007-maike/intern: include change for GLEW integration
Miguel Torres Lima
torreslima at gmail.com
Thu Jun 28 19:27:48 CEST 2007
Revision: 11108
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11108
Author: maike
Date: 2007-06-28 19:27:48 +0200 (Thu, 28 Jun 2007)
Log Message:
-----------
include change for GLEW integration
Modified Paths:
--------------
branches/soc-2007-maike/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/soc-2007-maike/intern/bmfont/test/simpletest/BMF_Test.cpp
branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp
branches/soc-2007-maike/intern/decimation/test/decimate_glut_test/intern/GlutMeshDrawer.h
branches/soc-2007-maike/intern/elbeem/intern/solver_interface.h
branches/soc-2007-maike/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2007-maike/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2007-maike/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2007-maike/intern/ghost/test/multitest/GL.h
branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h
branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h
branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/main.cpp
Modified: branches/soc-2007-maike/intern/bmfont/intern/BMF_BitmapFont.cpp
===================================================================
--- branches/soc-2007-maike/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-06-28 17:27:48 UTC (rev 11108)
@@ -47,13 +47,13 @@
#pragma warning(disable:4244)
#endif /* __CYGWIN32__ */
#include <windows.h>
- #include <GL/gl.h>
+ #include <GL/glew.h>
#else // WIN32
// __APPLE__ is defined
- #include <AGL/gl.h>
+ #include <GL/glew.h>
#endif // WIN32
#else // defined(WIN32) || defined(__APPLE__)
- #include <GL/gl.h>
+ #include <GL/glew.h>
#endif // defined(WIN32) || defined(__APPLE__)
#include "BMF_BitmapFont.h"
Modified: branches/soc-2007-maike/intern/bmfont/test/simpletest/BMF_Test.cpp
===================================================================
--- branches/soc-2007-maike/intern/bmfont/test/simpletest/BMF_Test.cpp 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/bmfont/test/simpletest/BMF_Test.cpp 2007-06-28 17:27:48 UTC (rev 11108)
@@ -50,13 +50,13 @@
#if defined(WIN32) || defined(__APPLE__)
#ifdef WIN32
#include <windows.h>
-#include <GL/gl.h>
+#include <GL/glew.h>
#else // WIN32
// __APPLE__ is defined
-#include <AGL/gl.h>
+#include <GL/glew.h>
#endif // WIN32
#else // defined(WIN32) || defined(__APPLE__)
-#include <GL/gl.h>
+#include <GL/glew.h>
#endif // defined(WIN32) || defined(__APPLE__)
Modified: branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
===================================================================
--- branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2007-06-28 17:27:48 UTC (rev 11108)
@@ -41,14 +41,12 @@
#if defined(WIN32) || defined(__APPLE__)
# ifdef WIN32
# include <windows.h>
-# include <GL/gl.h>
-# include <GL/glu.h>
+# include <GL/glew.h>
# else // WIN32
-# include <AGL/gl.h>
+# include <GL/glew.h>
# endif // WIN32
#else // defined(WIN32) || defined(__APPLE__)
-# include <GL/gl.h>
-# include <GL/glu.h>
+# include <GL/glew.h>
#endif // defined(WIN32) || defined(__APPLE__)
Modified: branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp
===================================================================
--- branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp 2007-06-28 17:27:48 UTC (rev 11108)
@@ -40,14 +40,12 @@
#if defined(WIN32) || defined(__APPLE__)
# ifdef WIN32
# include <windows.h>
-# include <GL/gl.h>
-# include <GL/glu.h>
+# include <GL/glew.h>
# else // WIN32
-# include <AGL/gl.h>
+# include <GL/glew.h>
# endif // WIN32
#else // defined(WIN32) || defined(__APPLE__)
-# include <GL/gl.h>
-# include <GL/glu.h>
+# include <GL/glew.h>
#endif // defined(WIN32) || defined(__APPLE__)
#include <vector>
Modified: branches/soc-2007-maike/intern/decimation/test/decimate_glut_test/intern/GlutMeshDrawer.h
===================================================================
--- branches/soc-2007-maike/intern/decimation/test/decimate_glut_test/intern/GlutMeshDrawer.h 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/decimation/test/decimate_glut_test/intern/GlutMeshDrawer.h 2007-06-28 17:27:48 UTC (rev 11108)
@@ -41,15 +41,13 @@
#if defined(WIN32) || defined(__APPLE__)
#ifdef WIN32
#include <windows.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <GL/glew.h>
#else // WIN32
// __APPLE__ is defined
-#include <AGL/gl.h>
+#include <GL/glew.h>
#endif // WIN32
#else // defined(WIN32) || defined(__APPLE__)
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <GL/glew.h>
#endif // defined(WIN32) || defined(__APPLE__)
#include <vector>
// a concrete mesh drawer
Modified: branches/soc-2007-maike/intern/elbeem/intern/solver_interface.h
===================================================================
--- branches/soc-2007-maike/intern/elbeem/intern/solver_interface.h 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/elbeem/intern/solver_interface.h 2007-06-28 17:27:48 UTC (rev 11108)
@@ -21,7 +21,7 @@
#if LBM_USE_GUI==1
#define USE_GLUTILITIES
// for debug display
-#include <GL/gl.h>
+#include <GL/glew.h>
#include "../gui/guifuncs.h"
#endif
Modified: branches/soc-2007-maike/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/soc-2007-maike/intern/ghost/intern/GHOST_SystemX11.h 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/ghost/intern/GHOST_SystemX11.h 2007-06-28 17:27:48 UTC (rev 11108)
@@ -37,6 +37,7 @@
#define _GHOST_SYSTEM_X11_H_
#include <X11/Xlib.h>
+#include <GL/glew.h>
#include <GL/glx.h>
#include "GHOST_System.h"
Modified: branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowWin32.cpp 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowWin32.cpp 2007-06-28 17:27:48 UTC (rev 11108)
@@ -43,7 +43,7 @@
#include <string.h>
#include "GHOST_WindowWin32.h"
-#include <GL/gl.h>
+#include <GL/glew.h>
#include <math.h>
// MSVC6 still doesn't define M_PI
Modified: branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowX11.h
===================================================================
--- branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowX11.h 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/ghost/intern/GHOST_WindowX11.h 2007-06-28 17:27:48 UTC (rev 11108)
@@ -38,6 +38,7 @@
#include "GHOST_Window.h"
#include <X11/Xlib.h>
+#include <GL/glew.h>
#include <GL/glx.h>
// For tablets
#include <X11/extensions/XInput.h>
Modified: branches/soc-2007-maike/intern/ghost/test/gears/GHOST_C-Test.c
===================================================================
--- branches/soc-2007-maike/intern/ghost/test/gears/GHOST_C-Test.c 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/ghost/test/gears/GHOST_C-Test.c 2007-06-28 17:27:48 UTC (rev 11108)
@@ -57,13 +57,13 @@
#if defined(WIN32) || defined(__APPLE__)
#ifdef WIN32
#include <windows.h>
- #include <GL/gl.h>
+ #include <GL/glew.h>
#else /* WIN32 */
/* __APPLE__ is defined */
- #include <AGL/gl.h>
+ #include <GL/glew.h>
#endif /* WIN32 */
#else /* defined(WIN32) || defined(__APPLE__) */
- #include <GL/gl.h>
+ #include <GL/glew.h>
#endif /* defined(WIN32) || defined(__APPLE__) */
Modified: branches/soc-2007-maike/intern/ghost/test/gears/GHOST_Test.cpp
===================================================================
--- branches/soc-2007-maike/intern/ghost/test/gears/GHOST_Test.cpp 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/ghost/test/gears/GHOST_Test.cpp 2007-06-28 17:27:48 UTC (rev 11108)
@@ -53,13 +53,13 @@
#include <windows.h>
#include <atlbase.h>
- #include <GL/gl.h>
+ #include <GL/glew.h>
#else // WIN32
// __APPLE__ is defined
- #include <AGL/gl.h>
+ #include <GL/glew.h>
#endif // WIN32
#else // defined(WIN32) || defined(__APPLE__)
- #include <GL/gl.h>
+ #include <GL/glew.h>
#endif // defined(WIN32) || defined(__APPLE__)
#include "STR_String.h"
Modified: branches/soc-2007-maike/intern/ghost/test/multitest/GL.h
===================================================================
--- branches/soc-2007-maike/intern/ghost/test/multitest/GL.h 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/ghost/test/multitest/GL.h 2007-06-28 17:27:48 UTC (rev 11108)
@@ -33,12 +33,12 @@
#ifdef WIN32
#include <windows.h>
- #include <GL/gl.h>
+ #include <GL/glew.h>
#else // WIN32
// __APPLE__ is defined
- #include <AGL/gl.h>
+ #include <GL/glew.h>
#endif // WIN32
#else // defined(WIN32) || defined(__APPLE__)
- #include <GL/gl.h>
+ #include <GL/glew.h>
#endif // defined(WIN32) || defined(__APPLE__)
Modified: branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h
===================================================================
--- branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h 2007-06-28 17:27:48 UTC (rev 11108)
@@ -39,6 +39,7 @@
# include "IK_Qsolver.h"
# include "../intern/IK_QChain.h"
# include "../intern/IK_QSolver_Class.h"
+#include <GL/glew.h>
#include <GL/glut.h>
class ChainDrawer : public GlutDrawer
Modified: branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h
===================================================================
--- branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h 2007-06-28 17:27:48 UTC (rev 11108)
@@ -33,6 +33,7 @@
#define NAN_INCLUDED_MyGlutMouseHandler_h
#include "../common/GlutMouseManager.h"
+#include <GL/glew.h>
#include <GL/glut.h>
#include "IK_solver.h"
Modified: branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/main.cpp
===================================================================
--- branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/main.cpp 2007-06-28 17:26:58 UTC (rev 11107)
+++ branches/soc-2007-maike/intern/iksolver/test/ik_glut_test/intern/main.cpp 2007-06-28 17:27:48 UTC (rev 11108)
@@ -72,6 +72,7 @@
#include "IK_solver.h"
#endif
+#include <GL/glew.h>
#include <GL/glut.h>
#include "MT_Vector3.h"
#include "MT_Quaternion.h"
More information about the Bf-blender-cvs
mailing list