summaryrefslogtreecommitdiff
path: root/src/video_out/Makefile.am
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-09-08 22:10:29 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-09-08 22:10:29 +0000
commit0e808bf5ad2faf95c0a4562cc4cd44919d78ca64 (patch)
tree0861f7b4701c3d4b65fe1fa801fb18efd292da71 /src/video_out/Makefile.am
parent0fb9609e42f9649fa727ceef861a05cbf0f44e32 (diff)
downloadxine-lib-0e808bf5ad2faf95c0a4562cc4cd44919d78ca64.tar.gz
xine-lib-0e808bf5ad2faf95c0a4562cc4cd44919d78ca64.tar.bz2
XShm is back
CVS patchset: 2629 CVS date: 2002/09/08 22:10:29
Diffstat (limited to 'src/video_out/Makefile.am')
-rw-r--r--src/video_out/Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 532e7d87d..ee119f346 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -10,7 +10,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
@@ -48,19 +48,19 @@ xv_module = xineplug_vo_out_xv.la
#lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(directfb_module) $(aa_module) \
# $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
-lib_LTLIBRARIES = $(xv_module)
+lib_LTLIBRARIES = $(xshm_module) $(xv_module)
xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext \
$(top_builddir)/src/xine-utils/libxineutils.la
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-utils/libxineutils.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-utils/libxineutils.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
#xineplug_vo_out_opengl_la_LIBADD = $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) \