summaryrefslogtreecommitdiff
path: root/src/video_out/Makefile.am
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2002-11-04 22:48:14 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2002-11-04 22:48:14 +0000
commit6dfa060e12b45e81ec9902253eeb8bf1226bd141 (patch)
tree69740a1d970a6dadcff1323372fcef3983ae00bb /src/video_out/Makefile.am
parentf8856735d366d5cc71e3bb4c5397f979723e2a39 (diff)
downloadxine-lib-6dfa060e12b45e81ec9902253eeb8bf1226bd141.tar.gz
xine-lib-6dfa060e12b45e81ec9902253eeb8bf1226bd141.tar.bz2
Vidix is back to life.
CVS patchset: 3193 CVS date: 2002/11/04 22:48:14
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 4bc18f715..fcae74bf1 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -18,9 +18,9 @@ libdir = $(XINE_PLUGINDIR)
if HAVE_X11
xshm_module = xineplug_vo_out_xshm.la
#syncfb_module = xineplug_vo_out_syncfb.la
-#if HAVE_VIDIX
-#vidix_module = xineplug_vo_out_vidix.la
-#endif
+if HAVE_VIDIX
+vidix_module = xineplug_vo_out_vidix.la
+endif
if HAVE_XV
xv_module = xineplug_vo_out_xv.la
endif
@@ -58,7 +58,7 @@ endif
#lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(directfb_module) \
# $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
-lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) $(pgx64_module)
+lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) $(pgx64_module) $(vidix_module)
xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
xineplug_vo_out_xv_la_LIBADD = \
@@ -102,9 +102,9 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
#xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-#xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c
-#xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la
-#xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c
+xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la
+xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c
xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS)