Implemented VOUT_DISPLAY_GET_OPENGL in glwin32.

[vlc] / modules / video_output / Modules.am

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index f4751e868ea9ca413c06ede34729915c6b5a62d9..1b5fefac0847814aae4ce74d041195ebff6b8df6 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = msw qte x11
+SUBDIRS = msw qte
 # Automake forgets to add a proper tag to libtool with Objective-C files.
 # Moreocer Libtool should default tag to CC when none is specified but
 # obviously does not. Here is a fix for that.
@@ -19,36 +19,69 @@ SOURCES_opengllayer = opengllayer.m
 SOURCES_directfb = directfb.c
 SOURCES_vmem = vmem.c
 SOURCES_yuv = yuv.c
+SOURCES_vout_wrapper = wrapper.c
 
-libxcb_plugin_la_SOURCES = \
+libxcb_x11_plugin_la_SOURCES = \
        xcb/xcb_vlc.h \
        xcb/x11.c \
+       xcb/common.c \
        xcb/events.c
-libxcb_plugin_la_CFLAGS = $(AM_CFLAGS) \
-       $(XCB_CFLAGS) $(XCB_SHM) \
-       $(XPROTO_CFLAGS) \
-       $(XCB_AUX_CFLAGS) $(XCB_IMAGE_CFLAGS)
-libxcb_plugin_la_LIBADD = $(AM_LIBADD) \
-       $(XCB_LIBS) $(XCB_SHM) \
-       $(XPROTO_LIBS) \
-       $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
-libxcb_plugin_la_DEPENDENCIES =
+libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
+libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
+       $(XCB_LIBS) $(XCB_SHM_LIBS)
+libxcb_x11_plugin_la_DEPENDENCIES =
+
+libxcb_xv_plugin_la_SOURCES = \
+       xcb/xcb_vlc.h \
+       xcb/xvideo.c \
+       xcb/common.c \
+       xcb/events.c
+libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
+libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
+       $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
+libxcb_xv_plugin_la_DEPENDENCIES =
+
+libxcb_glx_plugin_la_SOURCES = \
+       xcb/xcb_vlc.h \
+       xcb/glx.c \
+       xcb/events.c
+libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XLIB_XCB_CFLAGS) $(GL_CFLAGS)
+libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
+       $(XLIB_XCB_LIBS) $(GL_LIBS)
+libxcb_glx_plugin_la_DEPENDENCIES =
 
 libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
 libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XPROTO_CFLAGS) \
        $(XCB_CFLAGS) \
-       $(XCB_AUX_CFLAGS) $(XCB_KEYSYMS_CFLAGS)
+       $(XCB_KEYSYMS_CFLAGS)
 libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
+       $(XPROTO_LIBS) \
        $(XCB_LIBS) \
-       $(XCB_AUX_LIBS) $(XCB_KEYSYMS_LIBS)
+       $(XCB_KEYSYMS_LIBS)
 libxcb_window_plugin_la_DEPENDENCIES =
 
-EXTRA_LTLIBRARIES += libxcb_plugin.la libxcb_window_plugin.la
-libvlc_LTLIBRARIES += $(LTLIBxcb) $(LTLIBxcb_window)
+EXTRA_LTLIBRARIES += \
+       libxcb_x11_plugin.la \
+       libxcb_xv_plugin.la \
+       libxcb_glx_plugin.la \
+       libxcb_window_plugin.la
+libvlc_LTLIBRARIES += \
+       $(LTLIBxcb_x11) \
+       $(LTLIBxcb_xv) \
+       $(LTLIBxcb_glx) \
+       $(LTLIBxcb_window)
 
 # XXX: do we need yet another modules/ subdirectory?
 libdrawable_plugin_la_SOURCES = drawable.c
 libdrawable_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdrawable_plugin_la_LIBADD = $(AM_LIBADD)
 libdrawable_plugin_la_DEPENDENCIES =
+if HAVE_WIN32
 libvlc_LTLIBRARIES += libdrawable_plugin.la
+endif
+
+libvlc_LTLIBRARIES += libvout_wrapper_plugin.la