Commit f5c17abd authored by Thomas Guillem's avatar Thomas Guillem

vout: move gl.c to opengl/display.c

parent c03e4f3d
...@@ -35,7 +35,7 @@ vout_LTLIBRARIES += libvout_ios2_plugin.la ...@@ -35,7 +35,7 @@ vout_LTLIBRARIES += libvout_ios2_plugin.la
endif endif
### OpenGL ### ### OpenGL ###
libgles2_plugin_la_SOURCES = $(OPENGL_DISPLAY_SRCS) video_output/gl.c libgles2_plugin_la_SOURCES = $(OPENGL_DISPLAY_SRCS) video_output/opengl/display.c
libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM)
libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
...@@ -43,7 +43,7 @@ libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' ...@@ -43,7 +43,7 @@ libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libgles2_plugin.la EXTRA_LTLIBRARIES += libgles2_plugin.la
vout_LTLIBRARIES += $(LTLIBgles2) vout_LTLIBRARIES += $(LTLIBgles2)
libgl_plugin_la_SOURCES = $(OPENGL_DISPLAY_SRCS) video_output/gl.c libgl_plugin_la_SOURCES = $(OPENGL_DISPLAY_SRCS) video_output/opengl/display.c
libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libgl_plugin_la_LIBADD = $(GL_LIBS) $(LIBM) libgl_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
if HAVE_GL if HAVE_GL
......
/** /**
* @file gl.c * @file display.c
* @brief OpenGL video output module * @brief OpenGL video output module
*/ */
/***************************************************************************** /*****************************************************************************
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_vout_display.h> #include <vlc_vout_display.h>
#include <vlc_opengl.h> #include <vlc_opengl.h>
#include "opengl/vout_helper.h" #include "vout_helper.h"
/* Plugin callbacks */ /* Plugin callbacks */
static int Open (vlc_object_t *); static int Open (vlc_object_t *);
......
...@@ -1133,11 +1133,11 @@ modules/video_output/drawable.c ...@@ -1133,11 +1133,11 @@ modules/video_output/drawable.c
modules/video_output/evas.c modules/video_output/evas.c
modules/video_output/egl.c modules/video_output/egl.c
modules/video_output/fb.c modules/video_output/fb.c
modules/video_output/gl.c
modules/video_output/glx.c modules/video_output/glx.c
modules/video_output/ios2.m modules/video_output/ios2.m
modules/video_output/kva.c modules/video_output/kva.c
modules/video_output/macosx.m modules/video_output/macosx.m
modules/video_output/opengl/display.c
modules/video_output/win32/direct3d9.c modules/video_output/win32/direct3d9.c
modules/video_output/win32/direct3d11.c modules/video_output/win32/direct3d11.c
modules/video_output/win32/directdraw.c modules/video_output/win32/directdraw.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment