Commit d7c76ba9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

wayland: agree on the name of video_output subdirectory

parent 35738e89
......@@ -125,19 +125,20 @@ endif
### Wayland ###
libwl_shm_plugin_la_SOURCES = video_output/wl/shm.c
nodist_libwl_shm_plugin_la_SOURCES = video_output/wl/scaler-protocol.c
libwl_shm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/video_output/wl
libwl_shm_plugin_la_SOURCES = video_output/wayland/shm.c
nodist_libwl_shm_plugin_la_SOURCES = video_output/wayland/scaler-protocol.c
libwl_shm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-I$(builddir)/video_output/wayland
libwl_shm_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
libwl_shm_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS)
EXTRA_DIST += video_output/wayland/scaler.xml
CLEANFILES += $(nodist_libwl_shm_plugin_la_SOURCES)
if HAVE_WAYLAND
BUILT_SOURCES += video_output/wl/scaler-client-protocol.h
BUILT_SOURCES += video_output/wayland/scaler-client-protocol.h
vout_LTLIBRARIES += libwl_shm_plugin.la
endif
libwl_shell_surface_plugin_la_SOURCES = video_output/wl/shell_surface.c
libwl_shell_surface_plugin_la_SOURCES = video_output/wayland/shell_surface.c
libwl_shell_surface_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
libwl_shell_surface_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
if HAVE_WAYLAND
......
......@@ -1176,8 +1176,8 @@ modules/video_output/msw/wingdi.c
modules/video_output/sdl.c
modules/video_output/vdummy.c
modules/video_output/vmem.c
modules/video_output/wl/shell_surface.c
modules/video_output/wl/shm.c
modules/video_output/wayland/shell_surface.c
modules/video_output/wayland/shm.c
modules/video_output/xcb/glx.c
modules/video_output/xcb/window.c
modules/video_output/xcb/x11.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment