Converted misc/rtsp.c to vlc_clone().

[vlc] / modules / video_output / Modules.am

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 1d663685cca75d1ac3175e143e3296534c0d9b73..6deb679f3783b84ea5a11aa6985faacebdc6f7cf 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -8,13 +8,39 @@ SOURCES_aa = aa.c
 SOURCES_caca = caca.c
 SOURCES_fb = fb.c
 SOURCES_vout_sdl = sdl.c
-SOURCES_snapshot = snapshot.c
 SOURCES_directfb = directfb.c
 SOURCES_vmem = vmem.c
 SOURCES_yuv = yuv.c
 SOURCES_vout_macosx = macosx.m opengl.h opengl.c
 SOURCES_vout_ios = ios.m opengl.h opengl.c
 
+
+### 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)
+libgles2_plugin_la_DEPENDENCIES =
+
+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)
+libgles1_plugin_la_DEPENDENCIES =
+
+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)
+libgl_plugin_la_DEPENDENCIES =
+
+EXTRA_LTLIBRARIES += \
+       libgles2_plugin.la \
+       libgles1_plugin.la \
+       libgl_plugin.la
+libvlc_LTLIBRARIES += \
+       $(LTLIBgles1) \
+       $(LTLIBgl)
+
+
 ### XCB ###
 libxcb_x11_plugin_la_SOURCES = \
        xcb/xcb_vlc.h \
@@ -83,14 +109,12 @@ libvlc_LTLIBRARIES += libdrawable_plugin.la
 endif
 
 ### EGL ###
-libegl_plugin_la_SOURCES = \
-       opengl.h opengl.c \
-       egl.c
-#FIXME FIXME FIXME
-libegl_plugin_la_CFLAGS = $(AM_CFLAGS) \
-       $(EGL_CFLAGS) $(GL_CFLAGS)
-libegl_plugin_la_LIBADD = $(AM_LIBADD) \
-       $(EGL_LIBS) $(GL_LIBS)
+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
+libegl_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
+endif
 libegl_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += libegl_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBegl)