[Bf-blender-cvs] [6432fa488a8] master: Cleanup: Remove GLEW dependencies outside of GL module
Clément Foucault
noreply at git.blender.org
Sat Sep 12 17:35:41 CEST 2020
Commit: 6432fa488a8a8ac43f340d492da4fbca0f94e085
Author: Clément Foucault
Date: Sat Sep 12 15:49:53 2020 +0200
Branches: master
https://developer.blender.org/rB6432fa488a8a8ac43f340d492da4fbca0f94e085
Cleanup: Remove GLEW dependencies outside of GL module
===================================================================
M source/blender/blenfont/CMakeLists.txt
M source/blender/blenkernel/CMakeLists.txt
M source/blender/draw/CMakeLists.txt
M source/blender/editors/animation/CMakeLists.txt
M source/blender/editors/armature/CMakeLists.txt
M source/blender/editors/curve/CMakeLists.txt
M source/blender/editors/gizmo_library/CMakeLists.txt
M source/blender/editors/gpencil/CMakeLists.txt
M source/blender/editors/interface/CMakeLists.txt
M source/blender/editors/mask/CMakeLists.txt
M source/blender/editors/mesh/CMakeLists.txt
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/physics/CMakeLists.txt
M source/blender/editors/render/CMakeLists.txt
M source/blender/editors/screen/CMakeLists.txt
M source/blender/editors/sculpt_paint/CMakeLists.txt
M source/blender/editors/space_action/CMakeLists.txt
M source/blender/editors/space_buttons/CMakeLists.txt
M source/blender/editors/space_clip/CMakeLists.txt
M source/blender/editors/space_console/CMakeLists.txt
M source/blender/editors/space_file/CMakeLists.txt
M source/blender/editors/space_graph/CMakeLists.txt
M source/blender/editors/space_image/CMakeLists.txt
M source/blender/editors/space_info/CMakeLists.txt
M source/blender/editors/space_nla/CMakeLists.txt
M source/blender/editors/space_node/CMakeLists.txt
M source/blender/editors/space_outliner/CMakeLists.txt
M source/blender/editors/space_script/CMakeLists.txt
M source/blender/editors/space_sequencer/CMakeLists.txt
M source/blender/editors/space_statusbar/CMakeLists.txt
M source/blender/editors/space_text/CMakeLists.txt
M source/blender/editors/space_topbar/CMakeLists.txt
M source/blender/editors/space_view3d/CMakeLists.txt
M source/blender/editors/transform/CMakeLists.txt
M source/blender/editors/util/CMakeLists.txt
M source/blender/editors/uvedit/CMakeLists.txt
M source/blender/gpencil_modifiers/CMakeLists.txt
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/intern/gpu_debug.cc
M source/blender/gpu/intern/gpu_select_pick.c
M source/blender/gpu/opengl/gl_drawlist.hh
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/modifiers/CMakeLists.txt
M source/blender/nodes/CMakeLists.txt
M source/blender/python/generic/bgl.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/render/CMakeLists.txt
M source/blender/shader_fx/CMakeLists.txt
M source/blender/windowmanager/CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index ac927dd388d..3fd0dd95ef8 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -33,7 +33,6 @@ set(INC
)
set(INC_SYS
- ${GLEW_INCLUDE_PATH}
${FREETYPE_INCLUDE_DIRS}
)
@@ -75,6 +74,5 @@ if(WITH_PYTHON)
)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index cf43d0fe845..cc5226a1ab7 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -57,7 +57,6 @@ set(INC
)
set(INC_SYS
- ${GLEW_INCLUDE_PATH}
${ZLIB_INCLUDE_DIRS}
)
@@ -457,7 +456,6 @@ if(WITH_BINRELOC)
add_definitions(-DWITH_BINRELOC)
endif()
-add_definitions(${GL_DEFINITIONS})
if(WIN32)
list(APPEND INC
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 8fbf30507a5..1344d390871 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -44,10 +44,6 @@ set(INC
../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
intern/draw_cache.c
intern/draw_cache_extract_mesh.c
@@ -442,7 +438,6 @@ if(WITH_GTESTS)
endif()
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index ce6778a1ff9..1ca9a844feb 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -30,9 +30,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
set(SRC
anim_channels_defines.c
@@ -69,6 +66,5 @@ if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 71c7febe192..98c050950be 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -31,10 +31,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
armature_add.c
armature_edit.c
@@ -67,6 +63,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index ff80c47baa8..877c2d99102 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -31,10 +31,6 @@ set(INC
../../../../extern/curve_fit_nd
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
curve_ops.c
editcurve.c
@@ -59,6 +55,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt
index 1f3edf31b19..eeb1e60166b 100644
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -32,10 +32,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
gizmo_draw_utils.c
gizmo_geometry.h
@@ -59,6 +55,5 @@ set(SRC
set(LIB
)
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_gizmo_library "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 735ad8bc039..20408327105 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -31,10 +31,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
annotate_draw.c
annotate_paint.c
@@ -75,6 +71,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index e4fb0631f06..680cf3ea01a 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -34,10 +34,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
interface.c
interface_align.c
@@ -113,6 +109,5 @@ if(WIN32)
endif()
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt
index 66c055d9426..dd04732a814 100644
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -30,10 +30,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
mask_add.c
mask_draw.c
@@ -51,6 +47,5 @@ set(SRC
set(LIB
)
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_mask "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 589b51ce942..035af772a55 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -35,10 +35,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
editface.c
editmesh_add.c
@@ -97,6 +93,5 @@ if(WITH_GMP)
add_definitions(-DWITH_GMP)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 953ef8114f9..be6c0658b1f 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -39,10 +39,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
object_add.c
object_bake.c
@@ -81,7 +77,6 @@ set(LIB
bf_windowmanager
)
-add_definitions(${GL_DEFINITIONS})
if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index 0998280c381..2b9d9aaa0e1 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -30,10 +30,6 @@ set(INC
../../../../intern/mantaflow/extern
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
dynamicpaint_ops.c
particle_boids.c
@@ -74,6 +70,5 @@ if(WITH_BULLET)
add_definitions(-DWITH_BULLET)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index 7f7748bf52f..642e92592f1 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -34,10 +34,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
render_internal.c
render_opengl.c
@@ -61,7 +57,6 @@ else()
)
endif()
-add_definitions(${GL_DEFINITIONS})
if(WITH_FREESTYLE)
list(APPEND INC
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index dc355148ad3..1de5ad729c5 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -33,10 +33,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
area.c
area_query.c
@@ -64,6 +60,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 51cfb912722..930f9890dd9 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -36,10 +36,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
paint_cursor.c
paint_curve.c
@@ -90,6 +86,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt
index 6c43f8b9549..10dcc77fc24 100644
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -28,10 +28,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
action_buttons.c
action_data.c
@@ -49,6 +45,5 @@ set(LIB
bf_blenlib
)
-add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index 75d91174470..ce0787dbdb9 100644
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -28,10 +28,6 @@ set(INC
../../../../intern/guardedalloc
)
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
set(SRC
buttons_context.c
buttons_ops.c
@@ -48,7 +44,6 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
-add_definitions(${GL_DEFINITIONS})
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list