summaryrefslogtreecommitdiff
path: root/src/video_out/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out/Makefile.am')
-rw-r--r--src/video_out/Makefile.am14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 833814691..a0feae318 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -16,7 +16,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
libdir = $(XINE_PLUGINDIR)
if HAVE_X11
-#xshm_module = xineplug_vo_out_xshm.la
+xshm_module = xineplug_vo_out_xshm.la
#syncfb_module = xineplug_vo_out_syncfb.la
#if HAVE_VIDIX
#vidix_module = xineplug_vo_out_vidix.la
@@ -57,7 +57,7 @@ endif
#lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(directfb_module) \
# $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
-lib_LTLIBRARIES = $(xv_module) $(aa_module)
+lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module)
xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
xineplug_vo_out_xv_la_LIBADD = \
@@ -68,11 +68,11 @@ xineplug_vo_out_xv_la_LIBADD = \
xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module
-#xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
-# alphablend.c video_out_xshm.c
-#xineplug_vo_out_xshm_la_LIBADD = $(X_LIBS) -lXext \
-# $(top_builddir)/src/xine-engine/libxine.la
-#xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
+xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+ alphablend.c video_out_xshm.c
+xineplug_vo_out_xshm_la_LIBADD = $(X_LIBS) -lXext \
+ $(top_builddir)/src/xine-engine/libxine.la
+xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
#xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
# alphablend.c video_out_opengl.c