[vlc-commits] [Git][videolan/vlc][master] 2 commits: test: only add zvbi/telx plugin to demux runner in static build

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
6382d1e4 by Steve Lhomme at 2025-09-29T08:52:31+00:00
test: only add zvbi/telx plugin to demux runner in static build

- - - - -
898a147a by Steve Lhomme at 2025-09-29T08:52:31+00:00
test: support vlc-demux-run on macOS

- - - - -


1 changed file:

- test/Makefile.am


Changes:

=====================================
test/Makefile.am
=====================================
@@ -428,13 +428,13 @@ libvlc_demux_dec_run_la_LIBADD += \
 	../modules/libsvcdsub_plugin.la \
 	../modules/libtextst_plugin.la \
 	../modules/libsubstx3g_plugin.la
-endif
 if HAVE_ZVBI
 libvlc_demux_dec_run_la_LIBADD += ../modules/libzvbi_plugin.la
 endif
 if HAVE_TELX
 libvlc_demux_dec_run_la_LIBADD += ../modules/libtelx_plugin.la
 endif
+endif
 EXTRA_LTLIBRARIES += libvlc_demux_dec_run.la
 
 #
@@ -444,6 +444,11 @@ vlc_demux_run_LDFLAGS = -no-install -static
 vlc_demux_run_LDADD = libvlc_demux_run.la
 vlc_demux_dec_run_SOURCES = vlc-demux-run.c
 vlc_demux_dec_run_LDFLAGS = -no-install -static
+if HAVE_OSX
+vlc_demux_dec_run_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../lib/.libs/"
+vlc_demux_dec_run_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../src/.libs/"
+vlc_demux_dec_run_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../Frameworks/"
+endif
 vlc_demux_dec_run_LDADD = libvlc_demux_dec_run.la
 EXTRA_PROGRAMS += vlc-demux-run vlc-demux-dec-run
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/cae7c5875f6fe0c4a604699e89b1006471c82c80...898a147a5cb4068a7c8d46bcd02c9c1f450a5eea

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


VideoLAN code repository instance