[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47518] branches/soc-2012-swiss_cheese: Fixed all places that used "" instead of <> to include glew.h.

Jason Wilkins Jason.A.Wilkins at gmail.com
Wed Jun 6 16:28:50 CEST 2012


Revision: 47518
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47518
Author:   jwilkins
Date:     2012-06-06 14:28:40 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Fixed all places that used "" instead of <> to include glew.h.  Defined -DGLEW_STATIC for all modules that use GLEW.

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/intern/cycles/util/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/animation/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/include/BIF_gl.h
    branches/soc-2012-swiss_cheese/source/blender/editors/interface/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/render/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_action/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/space_time/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_material.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2012-swiss_cheese/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Dome.h
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
    branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/Texture.cpp

Modified: branches/soc-2012-swiss_cheese/intern/cycles/util/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/intern/cycles/util/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/intern/cycles/util/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -64,3 +64,5 @@
 include_directories(${INC})
 
 add_library(cycles_util ${SRC} ${SRC_HEADERS})
+
+add_definitions(-DGLEW_STATIC)

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/animation/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/animation/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/animation/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -58,4 +58,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/armature/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/armature/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -59,4 +59,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -51,4 +51,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/include/BIF_gl.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/include/BIF_gl.h	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/include/BIF_gl.h	2012-06-06 14:28:40 UTC (rev 47518)
@@ -33,7 +33,7 @@
 #ifndef __BIF_GL_H__
 #define __BIF_GL_H__
 
-#include "GL/glew.h"
+#include <GL/glew.h>
 /*
  * these should be phased out. cpack should be replaced in
  * code with calls to glColor3ub. - zr

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/interface/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/interface/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/interface/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -70,4 +70,6 @@
 	add_definitions(-DWITH_PYTHON)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/mesh/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/mesh/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -68,4 +68,6 @@
 	)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/physics/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/physics/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -54,4 +54,6 @@
 	add_definitions(-DPARALLEL=1)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/render/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/render/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/render/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -68,4 +68,6 @@
 	add_definitions(-DWITH_HEADLESS)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/screen/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/screen/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -51,4 +51,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -56,4 +56,6 @@
 	sculpt_intern.h
 )
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_action/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_action/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_action/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -43,4 +43,6 @@
 	action_intern.h
 )
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -48,4 +48,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -56,4 +56,6 @@
 	clip_intern.h
 )
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_console/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_console/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_console/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -46,4 +46,6 @@
 	add_definitions(-DWITH_PYTHON)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_file/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_file/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -82,4 +82,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -57,4 +57,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_image/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_image/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -66,4 +66,6 @@
 	add_definitions(-DWITH_CINEON)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_info/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_info/CMakeLists.txt	2012-06-06 14:14:41 UTC (rev 47517)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_info/CMakeLists.txt	2012-06-06 14:28:40 UTC (rev 47518)
@@ -52,4 +52,6 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list