4ea2baf4ae
The cleanup of blenkernel last weeks , caused the house of cards to collapse on top of bf_gpu's shader_builder, which is off by default but used on a daily basis by the rendering team. Given the fixes forward in #110394 ran into a ODR violation in OSL that was hiding there for years, I don't see another way forward without impeding the rendering teams productivity for "quite a while" as there is no guarantee the OSL issue would be the end of it. the only way forward appears to be back. this reverts :19422044eda670b53abe0f541db97cbe516e8c813e88a2f44c4e64b772f59547e7a31707fe6c5a57The problematic commit was07fe6c5a57as blenkernel links most of blender, it's a bit of a link order issue magnet. Given all these commits stack, it's near impossible to revert just that one without spending a significant amount of time resolving merge conflicts. 99% of that work was automated, so easier to just revert all of them, and re-do the work, than it is to deal with the merge conflicts. Pull Request: https://projects.blender.org/blender/blender/pulls/110438
56 lines
885 B
CMake
56 lines
885 B
CMake
# SPDX-FileCopyrightText: 2023 Blender Foundation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
.
|
|
../../blenkernel
|
|
../../gpu
|
|
../../makesrna
|
|
../../../../intern/clog
|
|
)
|
|
|
|
set(INC_SYS
|
|
${Epoxy_INCLUDE_DIRS}
|
|
${PYTHON_INCLUDE_DIRS}
|
|
)
|
|
|
|
set(SRC
|
|
bgl.cc
|
|
bl_math_py_api.cc
|
|
blf_py_api.cc
|
|
bpy_threads.cc
|
|
idprop_py_api.cc
|
|
idprop_py_ui_api.cc
|
|
imbuf_py_api.cc
|
|
py_capi_rna.cc
|
|
py_capi_utils.cc
|
|
|
|
bgl.h
|
|
bl_math_py_api.h
|
|
blf_py_api.h
|
|
idprop_py_api.h
|
|
idprop_py_ui_api.h
|
|
imbuf_py_api.h
|
|
py_capi_rna.h
|
|
py_capi_utils.h
|
|
|
|
# header-only
|
|
python_utildefines.h
|
|
)
|
|
|
|
set(LIB
|
|
${Epoxy_LIBRARIES}
|
|
${PYTHON_LINKFLAGS}
|
|
${PYTHON_LIBRARIES}
|
|
PRIVATE bf::blenlib
|
|
PRIVATE bf::dna
|
|
PRIVATE bf::intern::guardedalloc
|
|
)
|
|
|
|
if(WITH_PYTHON_MODULE)
|
|
add_definitions(-DWITH_PYTHON_MODULE)
|
|
endif()
|
|
|
|
blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|