mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: d3d11: Remove d3d11 option check from gst-libs

Browse source 
Build gstd3d11-1.0 unconditionally for d3d11 implementation can be used
by non-d3d11 plugins even when d3d11 plugin is disabled

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1684>
This commit is contained in:
Seungha Yang 2022-02-12 00:51:56 +09:00 committed by GStreamer Marge Bot
parent e96687d88d
commit 644e18d029
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
View file

@ -9,12 +9,10 @@ d3d11_sources = [
gstd3d11_dep = dependency('', required : false) gstd3d11_dep = dependency('', required : false)
d3d11_option = get_option('d3d11') if host_system != 'windows'
if host_system != 'windows' or d3d11_option.disabled()
subdir_done() subdir_done()
endif endif
have_d3d11 = false
extra_c_args = [ extra_c_args = [
'-DCOBJMACROS', '-DCOBJMACROS',
] ]
@ -29,16 +27,12 @@ have_dxgidebug_h = false
d3d11_winapi_app = false d3d11_winapi_app = false
d3d11_conf = configuration_data() d3d11_conf = configuration_data()
d3d11_lib = cc.find_library('d3d11', required : d3d11_option) d3d11_lib = cc.find_library('d3d11', required : false)
dxgi_lib = cc.find_library('dxgi', required : d3d11_option) dxgi_lib = cc.find_library('dxgi', required : false)
d3dcompiler_lib = cc.find_library('d3dcompiler', required: d3d11_option) d3dcompiler_lib = cc.find_library('d3dcompiler', required: false)
runtimeobject_lib = cc.find_library('runtimeobject', required : false) runtimeobject_lib = cc.find_library('runtimeobject', required : false)
have_d3d11 = d3d11_lib.found() and dxgi_lib.found() and cc.has_header('d3d11_4.h') and cc.has_header('dxgi1_6.h') if not d3d11_lib.found() or not dxgi_lib.found() or not cc.has_header('d3d11_4.h') or not cc.has_header('dxgi1_6.h')
if not have_d3d11
if d3d11_option.enabled()
error('The d3d11 was enabled explicitly, but required dependencies were not found.')
endif
subdir_done() subdir_done()
endif endif
@ -67,7 +61,7 @@ if runtimeobject_lib.found() and d3dcompiler_lib.found()
endif endif
if not d3d11_winapi_desktop and not d3d11_winapi_app if not d3d11_winapi_desktop and not d3d11_winapi_app
error('Neither Desktop partition nor App partition') subdir_done()
endif endif
d3d11_winapi_only_app = d3d11_winapi_app and not d3d11_winapi_desktop d3d11_winapi_only_app = d3d11_winapi_app and not d3d11_winapi_desktop