diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index b254d0e765..1532ffad4c 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -64,8 +64,10 @@ endif libaudiotoolboxmidi_plugin_la_SOURCES = codec/audiotoolbox_midi.c libaudiotoolboxmidi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreFoundation,-framework,AudioToolbox if HAVE_DARWIN +if !HAVE_WATCHOS codec_LTLIBRARIES += libaudiotoolboxmidi_plugin.la endif +endif liblpcm_plugin_la_SOURCES = codec/lpcm.c codec_LTLIBRARIES += liblpcm_plugin.la @@ -364,8 +366,10 @@ libvideotoolbox_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) # Trigger MODULE_NAME declar libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la libvlc_hxxxhelper.la libvlc_vtutils.la libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreFoundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo -Wl,-framework,Metal if HAVE_DARWIN +if !HAVE_WATCHOS codec_LTLIBRARIES += libvideotoolbox_plugin.la endif +endif videotoolbox_dpb_test_SOURCES = codec/videotoolbox/dpb_test.c \ codec/videotoolbox/dpb.c \ diff --git a/modules/services_discovery/Makefile.am b/modules/services_discovery/Makefile.am index db9085f437..261a264c79 100644 --- a/modules/services_discovery/Makefile.am +++ b/modules/services_discovery/Makefile.am @@ -92,8 +92,10 @@ libbonjour_plugin_la_SOURCES = services_discovery/bonjour.m libbonjour_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc libbonjour_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)' -Wl,-framework,Foundation if HAVE_DARWIN +if !HAVE_WATCHOS sd_LTLIBRARIES += libbonjour_plugin.la endif +endif libudisks_plugin_la_SOURCES = services_discovery/udisks.c libudisks_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDBUS_CFLAGS) diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am index 310d007489..6ccb46573e 100644 --- a/modules/video_chroma/Makefile.am +++ b/modules/video_chroma/Makefile.am @@ -84,8 +84,10 @@ libcvpx_plugin_la_SOURCES = codec/vt_utils.c codec/vt_utils.h video_chroma/cvpx. libcvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo libcvpx_plugin_la_LIBADD = libchroma_copy.la if HAVE_DARWIN +if !HAVE_WATCHOS chroma_LTLIBRARIES += libcvpx_plugin.la endif +endif libgst_mem_plugin_la_SOURCES = video_chroma/gst_mem.c \ codec/gstreamer/gstcopypicture.c codec/gstreamer/gstcopypicture.h codec/gstreamer/gst_mem.h diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am index f794a8fe37..80f12155fc 100644 --- a/modules/video_filter/Makefile.am +++ b/modules/video_filter/Makefile.am @@ -57,9 +57,11 @@ librotate_plugin_la_LIBADD = libvlc_motion.la $(LIBM) librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' if HAVE_DARWIN if !HAVE_TVOS +if !HAVE_WATCHOS librotate_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation endif endif +endif libscale_plugin_la_SOURCES = video_filter/scale.c libscene_plugin_la_SOURCES = video_filter/scene.c libscene_plugin_la_LIBADD = $(LIBM) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index 88cbe67d47..8899711030 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -74,6 +74,7 @@ vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la libwindo endif if HAVE_DARWIN +if !HAVE_WATCHOS libsamplebufferdisplay_plugin_la_SOURCES = video_output/apple/VLCSampleBufferDisplay.m codec/vt_utils.c codec/vt_utils.h libsamplebufferdisplay_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc if HAVE_OSX @@ -85,6 +86,7 @@ libsamplebufferdisplay_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ endif vout_LTLIBRARIES += libsamplebufferdisplay_plugin.la endif +endif libvout_ios_plugin_la_SOURCES = video_output/opengl/display.c $(OPENGL_VOUT_COMMONSOURCES) libvout_ios_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS) -DUSE_OPENGL_ES2