[vlc-commits] [Git][videolan/vlc][master] 2 commits: keystore: meson: use files() for windows files

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
9b49d899 by Alexandre Janniaux at 2025-02-20T06:25:22+00:00
keystore: meson: use files() for windows files

Otherwise, building on windows can fail with:

    modules/meson.build:407:17: ERROR: File file_crypt_win32.c does not exist.

- - - - -
a642a47d by Alexandre Janniaux at 2025-02-20T06:25:22+00:00
keystore: meson: add support for android

- - - - -


1 changed file:

- modules/keystore/meson.build


Changes:

=====================================
modules/keystore/meson.build
=====================================
@@ -7,15 +7,21 @@ vlc_modules += {
 # File keystore
 file_keystore_extra_sources = []
 file_keystore_extra_deps = []
+file_keystore_extra_link = []
 if host_system == 'windows'
-    file_keystore_extra_sources += 'file_crypt_win32.c'
+    file_keystore_extra_sources += files('file_crypt_win32.c')
     file_keystore_extra_deps += cc.find_library('crypt32', required: true)
 endif
-# TODO: Add Android-specific sources
+if host_system == 'android'
+    file_keystore_extra_sources += files('file_crypt_android.c')
+    file_keystore_extra_link += [libandroid_env]
+endif
+
 vlc_modules += {
     'name' : 'file_keystore',
-    'sources' : files('file.c', 'list_util.c', file_keystore_extra_sources),
-    'dependencies' : file_keystore_extra_deps
+    'sources' : files('file.c', 'list_util.c') + file_keystore_extra_sources,
+    'dependencies' : file_keystore_extra_deps,
+    'link_with' : file_keystore_extra_link,
 }
 
 # libsecret keystore



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d35724bc460eec7ab891fa8774482f8e3fd6cd89...a642a47d3864d7cca6e94ff683ab67c1501d0535

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


VideoLAN code repository instance