[vlc-commits] [Git][videolan/vlc][master] 2 commits: meson: fix MFT linking with external libraries

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f1f5e270 by Steve Lhomme at 2023-04-06T08:36:16+00:00
meson: fix MFT linking with external libraries

The module needs to use 'dependencies' for such dependencies.

- - - - -
cb8268f2 by Steve Lhomme at 2023-04-06T08:36:16+00:00
meson: fix D3D11 vout linking with external libraries

The module needs to use 'dependencies' for such dependencies.

- - - - -


2 changed files:

- modules/codec/meson.build
- modules/video_output/win32/meson.build


Changes:

=====================================
modules/codec/meson.build
=====================================
@@ -645,9 +645,9 @@ if host_system == 'windows'
         install: false
     )
 
-    mft_link_with = [ cc.find_library('mfplat'), d3d11_common_lib ]
+    mft_deps = [ cc.find_library('mfplat') ]
     if get_option('winstore_app')
-        mft_link_with += [ cc.find_library('d3d11') ]
+        mft_deps += [ cc.find_library('d3d11') ]
     endif
     vlc_modules += {
         'name' : 'mft',
@@ -660,7 +660,8 @@ if host_system == 'windows'
                 '../packetizer/h264_nal.c',
                 '../packetizer/hevc_nal.c'
             ),
-        'link_with' : mft_link_with
+        'link_with' : [ d3d11_common_lib ],
+        'dependencies' : mft_deps
     }
 endif
 


=====================================
modules/video_output/win32/meson.build
=====================================
@@ -5,8 +5,9 @@
 # Direct3D11 video output
 d3d11_sources = files('direct3d11.cpp', 'd3d11_quad.cpp', 'd3d11_shaders.cpp', 'd3d_shaders.c', 'd3d_dynamic_shader.c', 'd3d11_swapchain.cpp', 'dxgi_swapchain.cpp', 'common.c')
 d3d11_link_with = [ d3d11_common_lib ]
+d3d11_deps = []
 if get_option('winstore_app')
-    d3d11_link_with += [
+    d3d11_deps += [
         cc.find_library('d3d11'),
         cc.find_library('d3dcompiler_47')
     ]
@@ -18,7 +19,8 @@ endif
 vlc_modules += {
     'name' : 'direct3d11',
     'sources' : d3d11_sources,
-    'link_with' : d3d11_link_with
+    'link_with' : d3d11_link_with,
+    'dependencies' : d3d11_deps
 }
 
 if have_win_desktop



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5d7fa7f67afeea843a031e90aa90433ba4eee7fb...cb8268f268088301d081382377d6ad875db4d092

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5d7fa7f67afeea843a031e90aa90433ba4eee7fb...cb8268f268088301d081382377d6ad875db4d092
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance