[vlc-commits] [Git][videolan/vlc][master] 3 commits: meson: make the Windows SDK installed path depend on the project name

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d1095bbf by Steve Lhomme at 2026-09-25T10:49:40+00:00
meson: make the Windows SDK installed path depend on the project name

As done for non-Windows targets.

- - - - -
15c56400 by Steve Lhomme at 2026-09-25T10:49:40+00:00
meson: factorize the path for the SDK base installation folder

- - - - -
d0f50b32 by Steve Lhomme at 2026-09-25T10:49:40+00:00
meson: install libvlc_xcb_events in <prefix>/lib/vlc

As done with autotools.

- - - - -


2 changed files:

- meson.build
- modules/video_output/meson.build


Changes:

=====================================
meson.build
=====================================
@@ -1019,9 +1019,7 @@ if host_system == 'windows'
     libdir_path = prefix_path
     pkglibdir_path = libdir_path / vlc_pkg_suffix
     plugins_path = prefix_path / 'plugins'
-    libvlc_header_path = prefix_path / 'sdk/include/vlc'
-    plugins_header_path = prefix_path / 'sdk/include/vlc/plugins'
-    vlccore_lib_path = prefix_path / 'sdk/lib'
+    vlc_sdk_path = prefix_path / 'sdk'
     bindir_path = prefix_path
     libexecdir_path = prefix_path
     pkglibexecdir_path = prefix_path
@@ -1030,14 +1028,15 @@ else
     libdir_path = prefix_path / get_option('libdir')
     pkglibdir_path = libdir_path / vlc_pkg_suffix
     plugins_path = pkglibdir_path / 'plugins'
-    libvlc_header_path = prefix_path / 'include' / vlc_pkg_suffix
-    plugins_header_path = prefix_path / 'include' / vlc_pkg_suffix / 'plugins'
-    vlccore_lib_path = prefix_path / 'lib'
+    vlc_sdk_path = prefix_path
     bindir_path = prefix_path / 'bin'
     libexecdir_path = prefix_path / get_option('libexecdir')
     pkglibexecdir_path = libexecdir_path / vlc_pkg_suffix
     localedir_path = prefix_path / get_option('localedir')
 endif
+libvlc_header_path = vlc_sdk_path / 'include' / vlc_pkg_suffix
+plugins_header_path = vlc_sdk_path / 'include' / vlc_pkg_suffix / 'plugins'
+vlccore_lib_path = vlc_sdk_path / 'lib'
 
 cdata.set_quoted('LIBDIR', libdir_path)
 cdata.set_quoted('PKGLIBDIR', pkglibdir_path)


=====================================
modules/video_output/meson.build
=====================================
@@ -237,7 +237,7 @@ if xcb_dep.found()
         include_directories: [vlc_include_dirs],
         dependencies: [xcb_dep, libvlccore_dep],
         install: true,
-        install_dir: libdir_path,
+        install_dir: pkglibdir_path,
         )
 
     if xcb_randr_dep.found() and xproto_dep.found()



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9e59d4b38f804b33491b332df7643c1f80cc0b57...d0f50b32339d27a420bdf478efafe6a853c48407

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9e59d4b38f804b33491b332df7643c1f80cc0b57...d0f50b32339d27a420bdf478efafe6a853c48407
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help