summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-04 17:02:16 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-04 17:02:16 +0000
commit8af328de08280e5abdbd02658cecd8dac64fd867 (patch)
tree842c68582f19b54f42ceeac62ee00211560b107d /src/video_out
parente54c70158ace712ff1026d8ef133404b1941078a (diff)
parentb9aad123aa3af9db55ce604b3eb185e26b0361a5 (diff)
downloadxine-lib-8af328de08280e5abdbd02658cecd8dac64fd867.tar.gz
xine-lib-8af328de08280e5abdbd02658cecd8dac64fd867.tar.bz2
Merge from 1.1.
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index c1d142263..763c9c90b 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -132,8 +132,8 @@ xineplug_vo_out_xxmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS) -fno-stri
xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
video_out_opengl.c myglext.h $(X11OSD)
-xineplug_vo_out_opengl_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
- $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL)
+xineplug_vo_out_opengl_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) $(OPENGL_LIBS) \
+ $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL)
xineplug_vo_out_opengl_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing
xineplug_vo_out_pgx64_la_SOURCES = video_out_pgx64.c