[vlc-devel] [PATCH 08/13] vout: move egl.c to opengl/egl.c
Thomas Guillem
thomas at gllm.fr
Mon Dec 12 17:03:49 CET 2016
---
modules/video_output/Makefile.am | 8 ++++----
modules/video_output/{ => opengl}/egl.c | 0
po/POTFILES.in | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
rename modules/video_output/{ => opengl}/egl.c (100%)
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index d07fad4..f62b263 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -87,7 +87,7 @@ libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XPROTO_CFLAGS) $(XCB_CFLAGS) $(XCB_KEYSYMS_CFLAGS)
libxcb_window_plugin_la_LIBADD = $(XPROTO_LIBS) $(XCB_LIBS) $(XCB_KEYSYMS_LIBS)
-libegl_x11_plugin_la_SOURCES = video_output/egl.c
+libegl_x11_plugin_la_SOURCES = video_output/opengl/egl.c
libegl_x11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_X11=1
libegl_x11_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
libegl_x11_plugin_la_LIBADD = $(EGL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
@@ -128,7 +128,7 @@ libwl_shell_surface_plugin_la_SOURCES = video_output/wayland/shell_surface.c
libwl_shell_surface_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
libwl_shell_surface_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
-libegl_wl_plugin_la_SOURCES = video_output/egl.c
+libegl_wl_plugin_la_SOURCES = video_output/opengl/egl.c
libegl_wl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WAYLAND=1
libegl_wl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) $(WAYLAND_EGL_CFLAGS)
libegl_wl_plugin_la_LIBADD = $(EGL_LIBS) $(WAYLAND_EGL_LIBS)
@@ -224,7 +224,7 @@ if HAVE_WIN32_DESKTOP
vout_LTLIBRARIES += libwingdi_plugin.la
endif
-libegl_win32_plugin_la_SOURCES = video_output/egl.c
+libegl_win32_plugin_la_SOURCES = video_output/opengl/egl.c
libegl_win32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WIN32=1
libegl_win32_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
libegl_win32_plugin_la_LIBADD = $(EGL_LIBS)
@@ -253,7 +253,7 @@ endif
### Android ###
-libegl_android_plugin_la_SOURCES = video_output/egl.c
+libegl_android_plugin_la_SOURCES = video_output/opengl/egl.c
libegl_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_PLATFORM_ANDROID=1
libegl_android_plugin_la_LIBADD = $(EGL_LIBS)
diff --git a/modules/video_output/egl.c b/modules/video_output/opengl/egl.c
similarity index 100%
rename from modules/video_output/egl.c
rename to modules/video_output/opengl/egl.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 27cfa85..f89fe2e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1145,13 +1145,13 @@ modules/video_output/decklink.cpp
modules/video_output/directfb.c
modules/video_output/drawable.c
modules/video_output/evas.c
-modules/video_output/egl.c
modules/video_output/fb.c
modules/video_output/glx.c
modules/video_output/ios2.m
modules/video_output/kva.c
modules/video_output/macosx.m
modules/video_output/opengl/display.c
+modules/video_output/opengl/egl.c
modules/video_output/win32/direct3d9.c
modules/video_output/win32/direct3d11.c
modules/video_output/win32/directdraw.c
--
2.10.2
More information about the vlc-devel
mailing list