Cleanup: Remove GLEW dependencies outside of GL module

This commit is contained in:
Clément Foucault 2020-09-12 15:49:53 +02:00
parent 136bdb561b
commit 6432fa488a
50 changed files with 2 additions and 189 deletions

View File

@ -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}")

View File

@ -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

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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)

View File

@ -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}")

View File

@ -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

View File

@ -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}")

View File

@ -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}")

View File

@ -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}")

View File

@ -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})
if(WITH_FREESTYLE)
add_definitions(-DWITH_FREESTYLE)

View File

@ -33,10 +33,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
clip_buttons.c
clip_dopesheet_draw.c
@ -68,7 +64,6 @@ set(LIB
bf_blenlib
)
add_definitions(${GL_DEFINITIONS})
if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)

View File

@ -28,10 +28,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
console_draw.c
console_ops.c
@ -49,6 +45,5 @@ if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -33,10 +33,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
file_draw.c
file_ops.c
@ -95,7 +91,6 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
if(WITH_FREESTYLE)
add_definitions(-DWITH_FREESTYLE)

View File

@ -29,10 +29,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
graph_buttons.c
graph_draw.c
@ -67,6 +63,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -35,10 +35,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
image_buttons.c
image_draw.c
@ -81,6 +77,5 @@ if(WITH_IMAGE_CINEON)
add_definitions(-DWITH_CINEON)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -33,10 +33,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
info_draw.c
info_ops.c
@ -56,6 +52,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -29,9 +29,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
nla_buttons.c
@ -54,6 +51,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -34,9 +34,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
drawnode.c
@ -75,6 +72,5 @@ if(WITH_OPENIMAGEDENOISE)
add_definitions(-DWITH_OPENIMAGEDENOISE)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -30,9 +30,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
outliner_collections.c
@ -60,6 +57,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -27,9 +27,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
script_edit.c
@ -49,6 +46,5 @@ if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_script "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -32,9 +32,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
sequencer_add.c
@ -73,6 +70,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -29,9 +29,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
space_statusbar.c
@ -42,6 +39,5 @@ set(LIB
bf_blenlib
)
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_statusbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -29,9 +29,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
space_text.c
@ -56,7 +53,6 @@ set(LIB
bf_blenlib
)
add_definitions(${GL_DEFINITIONS})
if(WITH_PYTHON)
list(APPEND INC

View File

@ -29,9 +29,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
space_topbar.c
@ -40,6 +37,5 @@ set(SRC
set(LIB
)
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_space_topbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -38,9 +38,6 @@ set(INC
${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
drawobject.c
@ -85,7 +82,6 @@ if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
add_definitions(${GL_DEFINITIONS})
if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)

View File

@ -33,9 +33,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
transform.c
@ -125,6 +122,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -33,9 +33,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
ed_transverts.c
@ -106,7 +103,6 @@ set(SRC
set(LIB
)
add_definitions(${GL_DEFINITIONS})
if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)

View File

@ -31,9 +31,6 @@ set(INC
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
uvedit_buttons.c
@ -58,6 +55,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -76,6 +76,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_gpencil_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -116,7 +116,6 @@ set(SRC
GPU_debug.h
GPU_drawlist.h
GPU_framebuffer.h
GPU_glew.h
GPU_immediate.h
GPU_immediate_util.h
GPU_index_buffer.h

View File

@ -29,7 +29,6 @@
#include "BKE_global.h"
#include "GPU_debug.h"
#include "GPU_glew.h"
#include "intern/gpu_private.h"
#include <stdio.h>

View File

@ -28,7 +28,6 @@
#include <string.h>
#include "GPU_framebuffer.h"
#include "GPU_glew.h"
#include "GPU_immediate.h"
#include "GPU_select.h"
#include "GPU_state.h"

View File

@ -31,7 +31,6 @@
#include "BLI_sys_types.h"
#include "GPU_batch.h"
#include "GPU_glew.h"
#include "gpu_drawlist_private.hh"

View File

@ -385,10 +385,6 @@ blender_include_dirs(
../../../../intern/mantaflow/extern
)
blender_include_dirs_sys(
"${GLEW_INCLUDE_PATH}"
)
add_cc_flags_custom_test(makesrna)
setup_platform_linker_flags()
@ -443,7 +439,6 @@ set(LIB
bf_editor_undo
)
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -178,7 +178,6 @@ if(WITH_GMP)
endif()
# So we can have special tricks in modifier system.
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -41,9 +41,6 @@ set(INC
../../../intern/sky/include
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
composite/nodes/node_composite_alphaOver.c
@ -343,7 +340,6 @@ if(WITH_COMPOSITOR)
add_definitions(-DWITH_COMPOSITOR)
endif()
add_definitions(${GL_DEFINITIONS})
if(WITH_FREESTYLE)
add_definitions(-DWITH_FREESTYLE)

View File

@ -27,12 +27,12 @@
#include <Python.h>
#include "BLI_utildefines.h"
#include "GPU_glew.h"
#include "MEM_guardedalloc.h"
#include "../generic/py_capi_utils.h"
#include "glew-mx.h"
#include "bgl.h"
/* -------------------------------------------------------------------- */

View File

@ -341,6 +341,5 @@ if(WITH_XR_OPENXR)
add_definitions(-DWITH_XR_OPENXR)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -39,9 +39,6 @@ set(INC
../../../intern/mantaflow/extern
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
intern/source/bake_api.c
@ -108,6 +105,5 @@ if(APPLE)
endif()
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -67,6 +67,5 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_shader_fx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -46,7 +46,6 @@ set(INC
set(INC_SYS
${ZLIB_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
)
set(SRC
@ -131,7 +130,6 @@ if(WITH_AUDASPACE)
)
endif()
add_definitions(${GL_DEFINITIONS})
if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)

View File

@ -51,9 +51,6 @@ if(WITH_TBB)
list(INSERT LIB 0 bf_blenkernel)
endif()
add_definitions(${GL_DEFINITIONS})
blender_include_dirs("${GLEW_INCLUDE_PATH}")
if(WIN32)
blender_include_dirs(../../intern/utfconv)
endif()