X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2FModules.am;h=5696f5be3682d1107543e6304c80cd68810b1152;hb=398d9abf74155ea6ad87fd75ed531b6239db2d93;hp=b115352bec8594d5080470c3be4a5a85c43460fa;hpb=1676fb0f6acf33646bee4535e3d332ab83d5ea17;p=vlc

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index b115352bec..5696f5be36 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -1,60 +1,85 @@
-SUBDIRS = msw
-# 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.
-LIBTOOL=@LIBTOOL@ --tag=CC
+AM_LIBTOOLFLAGS=--tag=CC
 
 SOURCES_aa = aa.c
-SOURCES_caca = caca.c
 SOURCES_fb = fb.c
-SOURCES_omapfb = omapfb.c
-SOURCES_ggi = ggi.c
 SOURCES_vout_sdl = sdl.c
-SOURCES_svgalib = svgalib.c
-SOURCES_mga = mga.c
-SOURCES_hd1000v = hd1000v.cpp
-SOURCES_snapshot = snapshot.c
-SOURCES_opengl = opengl.c opengl.h
 SOURCES_directfb = directfb.c
 SOURCES_vmem = vmem.c
 SOURCES_yuv = yuv.c
-SOURCES_vout_wrapper = wrapper.c
-SOURCES_vout_macosx = macosx.m
+SOURCES_vout_macosx = macosx.m opengl.h opengl.c
+SOURCES_vout_coregraphicslayer = coregraphicslayer.m
+SOURCES_vout_ios2 = ios2.m opengl.h opengl.c
+SOURCES_android_surface = androidsurface.c
 
+if HAVE_DECKLINK
+libdecklinkoutput_plugin_la_SOURCES = decklink.cpp
+libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklinkoutput)
+libdecklinkoutput_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) $(LIBDL)
+libvlc_LTLIBRARIES += libdecklinkoutput_plugin.la
+endif
+
+### OpenGL ###
+# TODO: merge all three source files (?)
+libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c
+libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES=2
+libgles2_plugin_la_LIBADD = $(AM_LIBADD) $(GLES2_LIBS)
+if HAVE_WIN32
+libgles2_plugin_la_DEPENDENCIES = libgles2_plugin.rc.o
+endif
+
+libgles1_plugin_la_SOURCES = opengl.c opengl.h gl.c
+libgles1_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES1_CFLAGS) -DUSE_OPENGL_ES=1
+libgles1_plugin_la_LIBADD = $(AM_LIBADD) $(GLES1_LIBS)
+if HAVE_WIN32
+libgles1_plugin_la_DEPENDENCIES = libgles1_plugin.rc.o
+endif
+
+libgl_plugin_la_SOURCES = opengl.c opengl.h gl.c
+libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
+libgl_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS)
+if HAVE_WIN32
+libgl_plugin_la_DEPENDENCIES = libgl_plugin.rc.o
+endif
+
+EXTRA_LTLIBRARIES += \
+	libgles2_plugin.la \
+	libgles1_plugin.la \
+	libgl_plugin.la
+libvlc_LTLIBRARIES += \
+	$(LTLIBgles2) $(LTLIBgles1) $(LTLIBgl)
+
+
+### XCB ###
 libxcb_x11_plugin_la_SOURCES = \
-	xcb/xcb_vlc.h \
-	xcb/x11.c \
-	xcb/common.c \
-	xcb/events.c
+	xcb/pictures.c xcb/pictures.h \
+	xcb/events.c xcb/events.h \
+	xcb/x11.c
 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
+	xcb/pictures.c xcb/pictures.h \
+	xcb/events.c xcb/events.h \
+	xcb/xvideo.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
+	opengl.c opengl.h \
+	xcb/events.c xcb/events.h \
+	xcb/glx.c
 libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XLIB_XCB_CFLAGS) $(GL_CFLAGS)
+	$(XCB_CFLAGS) $(GL_CFLAGS)
 libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XLIB_XCB_LIBS) $(GL_LIBS)
-libxcb_glx_plugin_la_DEPENDENCIES =
+	$(XCB_LIBS) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
 
-libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
+libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h xcb/xcb_keysym.h
 libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(CFLAGS_xcb_window) \
 	$(XPROTO_CFLAGS) \
 	$(XCB_CFLAGS) \
 	$(XCB_KEYSYMS_CFLAGS)
@@ -62,26 +87,138 @@ libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
 	$(XPROTO_LIBS) \
 	$(XCB_LIBS) \
 	$(XCB_KEYSYMS_LIBS)
-libxcb_window_plugin_la_DEPENDENCIES =
 
-EXTRA_LTLIBRARIES += \
+if HAVE_XCB
+libvlc_LTLIBRARIES += \
 	libxcb_x11_plugin.la \
-	libxcb_xv_plugin.la \
-	libxcb_glx_plugin.la \
 	libxcb_window_plugin.la
+endif
+EXTRA_LTLIBRARIES += \
+	libxcb_xv_plugin.la \
+	libxcb_glx_plugin.la
 libvlc_LTLIBRARIES += \
-	$(LTLIBxcb_x11) \
 	$(LTLIBxcb_xv) \
-	$(LTLIBxcb_glx) \
-	$(LTLIBxcb_window)
+	$(LTLIBxcb_glx)
+
+### Win32 ###
+libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libdirect2d_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirect2d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+if HAVE_WIN32
+libdirect2d_plugin_la_DEPENDENCIES = libdirect2d_plugin.rc.o
+endif
+libvlc_LTLIBRARIES += $(LTLIBdirect2d)
+EXTRA_LTLIBRARIES += libdirect2d_plugin.la
+
+libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libdirect3d_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirect3d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+if HAVE_WIN32
+libdirect3d_plugin_la_DEPENDENCIES = libdirect3d_plugin.rc.o
+endif
+libvlc_LTLIBRARIES += $(LTLIBdirect3d)
+EXTRA_LTLIBRARIES += libdirect3d_plugin.la
+
+libdirectdraw_plugin_la_SOURCES = msw/directx.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libdirectdraw_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirectdraw_plugin_la_LIBADD = $(AM_LIBADD) -luser32 -lgdi32 -lole32 -luuid
+if HAVE_WIN32
+libdirectdraw_plugin_la_DEPENDENCIES = libdirectdraw_plugin.rc.o
+endif
+
+if HAVE_DIRECTX
+libvlc_LTLIBRARIES += libdirectdraw_plugin.la
+endif
+
+libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS)
+libglwin32_plugin_la_LIBADD = $(AM_LIBADD) -lopengl32 -lgdi32 -lole32 -luuid
+if HAVE_WIN32
+libglwin32_plugin_la_DEPENDENCIES = libglwin32_plugin.rc.o
+endif
+libvlc_LTLIBRARIES += $(LTLIBglwin32)
+EXTRA_LTLIBRARIES += libglwin32_plugin.la
+
+libwingdi_plugin_la_SOURCES = msw/wingdi.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libwingdi_plugin_la_CFLAGS = $(AM_CFLAGS)
+libwingdi_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+if HAVE_WIN32
+libvlc_LTLIBRARIES += libwingdi_plugin.la
+libwingdi_plugin_la_DEPENDENCIES = libwingdi_plugin.rc.o
+endif
 
-# 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
+libdrawable_plugin_la_DEPENDENCIES = libdrawable_plugin.rc.o
+endif
+
+### OS/2 ###
+if HAVE_OS2
+libvlc_LTLIBRARIES += libdrawable_plugin.la
+endif
+
+libkva_plugin_la_SOURCES = kva.c
+libkva_plugin_la_CFLAGS = $(AM_CFLAGS)
+libkva_plugin_la_LIBADD = $(AM_LIBADD) $(KVA_LIBS)
+if HAVE_KVA
+libvlc_LTLIBRARIES += libkva_plugin.la
+endif
+
+### EGL ###
+libegl_plugin_la_SOURCES = egl.c
+libegl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
+libegl_plugin_la_LIBADD = $(AM_LIBADD) $(EGL_LIBS)
+if !HAVE_WIN32
+if !HAVE_DARWIN
+libegl_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
+endif
+else
+libegl_plugin_la_DEPENDENCIES = libegl_plugin.rc.o
+endif
+EXTRA_LTLIBRARIES += libegl_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBegl)
+
+### GLX ###
+libglx_plugin_la_SOURCES = glx.c
+libglx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
+libglx_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
+if HAVE_WIN32
+libglx_plugin_la_DEPENDENCIES = libglx_plugin.rc.o
 endif
+EXTRA_LTLIBRARIES += libglx_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBglx)
 
-libvlc_LTLIBRARIES += libvout_wrapper_plugin.la
+### Coloured ASCII art ###
+libcaca_plugin_la_SOURCES = caca.c
+libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
+libcaca_plugin_la_LIBADD = $(AM_LIBADD) $(CACA_LIBS)
+if !HAVE_WIN32
+if !HAVE_DARWIN
+libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
+endif
+else
+libcaca_plugin_la_DEPENDENCIES = libcaca_plugin.rc.o
+endif
+EXTRA_LTLIBRARIES += libcaca_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBcaca)
+
+### Common ###
+libvdummy_plugin_la_SOURCES = vdummy.c
+libvdummy_plugin_la_CFLAGS = $(AM_CFLAGS)
+libvdummy_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libvdummy_plugin_la_DEPENDENCIES = libvdummy_plugin.rc.o
+endif
+
+libvlc_LTLIBRARIES += \
+	libvdummy_plugin.la \
+	libvmem_plugin.la \
+	libyuv_plugin.la