diff options
author | wm4 <wm4@nowhere> | 2015-12-19 13:05:10 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-12-19 14:14:12 +0100 |
commit | 4cc1861378c3b1e989b5d92ea49e3d02f5e4a65a (patch) | |
tree | 3ae36f802e733d4deae518efc04a0a38e068c3b8 | |
parent | 6154c1d06d38bd236a0adb57556f7d871b75469b (diff) | |
download | mpv-4cc1861378c3b1e989b5d92ea49e3d02f5e4a65a.tar.bz2 mpv-4cc1861378c3b1e989b5d92ea49e3d02f5e4a65a.tar.xz |
vo_opengl: prefix per-backend source files with context_
-rw-r--r-- | TOOLS/old-makefile | 6 | ||||
-rw-r--r-- | video/out/opengl/context_angle.c (renamed from video/out/opengl/angle.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_cocoa.c (renamed from video/out/opengl/cocoa.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_drm_egl.c (renamed from video/out/opengl/drm_egl.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_dxinterop.c (renamed from video/out/opengl/dxinterop.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_rpi.c (renamed from video/out/opengl/rpi.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_rpi.h (renamed from video/out/opengl/rpi.h) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_w32.c (renamed from video/out/opengl/w32.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_wayland.c (renamed from video/out/opengl/wayland.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_x11.c (renamed from video/out/opengl/x11.c) | 0 | ||||
-rw-r--r-- | video/out/opengl/context_x11egl.c (renamed from video/out/opengl/x11egl.c) | 0 | ||||
-rw-r--r-- | video/out/vo_rpi.c | 2 | ||||
-rw-r--r-- | wscript_build.py | 18 |
13 files changed, 13 insertions, 13 deletions
diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile index 6d5a014cdd..8a3f41a7af 100644 --- a/TOOLS/old-makefile +++ b/TOOLS/old-makefile @@ -70,11 +70,11 @@ SOURCES-$(GL) += video/out/opengl/common.c \ SOURCES-$(ENCODING) += video/out/vo_lavc.c audio/out/ao_lavc.c \ common/encode_lavc.c -SOURCES-$(GL_X11) += video/out/x11_common.c video/out/opengl/x11.c -SOURCES-$(EGL_X11) += video/out/x11_common.c video/out/opengl/x11egl.c \ +SOURCES-$(GL_X11) += video/out/x11_common.c video/out/opengl/context_x11.c +SOURCES-$(EGL_X11) += video/out/x11_common.c video/out/opengl/context_x11egl.c \ video/out/opengl/egl_helpers.c SOURCES-$(GL_WAYLAND) += video/out/wayland_common.c \ - video/out/opengl/wayland.c + video/out/opengl/context_wayland.c SOURCES-$(JACK) += audio/out/ao_jack.c SOURCES-$(OPENAL) += audio/out/ao_openal.c diff --git a/video/out/opengl/angle.c b/video/out/opengl/context_angle.c index 61eb6af61b..61eb6af61b 100644 --- a/video/out/opengl/angle.c +++ b/video/out/opengl/context_angle.c diff --git a/video/out/opengl/cocoa.c b/video/out/opengl/context_cocoa.c index 1bcfa09755..1bcfa09755 100644 --- a/video/out/opengl/cocoa.c +++ b/video/out/opengl/context_cocoa.c diff --git a/video/out/opengl/drm_egl.c b/video/out/opengl/context_drm_egl.c index 34029a1a34..34029a1a34 100644 --- a/video/out/opengl/drm_egl.c +++ b/video/out/opengl/context_drm_egl.c diff --git a/video/out/opengl/dxinterop.c b/video/out/opengl/context_dxinterop.c index 2ea2ea0ec9..2ea2ea0ec9 100644 --- a/video/out/opengl/dxinterop.c +++ b/video/out/opengl/context_dxinterop.c diff --git a/video/out/opengl/rpi.c b/video/out/opengl/context_rpi.c index 55594413a8..55594413a8 100644 --- a/video/out/opengl/rpi.c +++ b/video/out/opengl/context_rpi.c diff --git a/video/out/opengl/rpi.h b/video/out/opengl/context_rpi.h index c2c6dd0dc4..c2c6dd0dc4 100644 --- a/video/out/opengl/rpi.h +++ b/video/out/opengl/context_rpi.h diff --git a/video/out/opengl/w32.c b/video/out/opengl/context_w32.c index 5157cd97a5..5157cd97a5 100644 --- a/video/out/opengl/w32.c +++ b/video/out/opengl/context_w32.c diff --git a/video/out/opengl/wayland.c b/video/out/opengl/context_wayland.c index c16444ba15..c16444ba15 100644 --- a/video/out/opengl/wayland.c +++ b/video/out/opengl/context_wayland.c diff --git a/video/out/opengl/x11.c b/video/out/opengl/context_x11.c index 46e9f0cb7e..46e9f0cb7e 100644 --- a/video/out/opengl/x11.c +++ b/video/out/opengl/context_x11.c diff --git a/video/out/opengl/x11egl.c b/video/out/opengl/context_x11egl.c index 18f947d48d..18f947d48d 100644 --- a/video/out/opengl/x11egl.c +++ b/video/out/opengl/context_x11egl.c diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c index cf051cfbc2..7ed6c39b49 100644 --- a/video/out/vo_rpi.c +++ b/video/out/vo_rpi.c @@ -40,7 +40,7 @@ #include "sub/osd.h" #include "opengl/osd.h" -#include "opengl/rpi.h" +#include "opengl/context_rpi.h" struct priv { DISPMANX_DISPLAY_HANDLE_T display; diff --git a/wscript_build.py b/wscript_build.py index dd7a25704c..a6ec6795b5 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -311,11 +311,18 @@ def build(ctx): ( "video/out/cocoa_common.m", "cocoa" ), ( "video/out/dither.c" ), ( "video/out/filter_kernels.c" ), - ( "video/out/opengl/cocoa.c", "gl-cocoa" ), ( "video/out/opengl/common.c", "gl" ), ( "video/out/opengl/context.c", "gl" ), + ( "video/out/opengl/context_angle.c", "egl-angle" ), + ( "video/out/opengl/context_cocoa.c", "gl-cocoa" ), + ( "video/out/opengl/context_drm_egl.c", "egl-drm" ), + ( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ), + ( "video/out/opengl/context_rpi.c", "rpi" ), + ( "video/out/opengl/context_wayland.c", "gl-wayland" ), + ( "video/out/opengl/context_w32.c", "gl-win32" ), + ( "video/out/opengl/context_x11.c", "gl-x11" ), + ( "video/out/opengl/context_x11egl.c", "egl-x11" ), ( "video/out/opengl/egl_helpers.c", "egl-helpers" ), - ( "video/out/opengl/rpi.c", "rpi" ), ( "video/out/opengl/hwdec.c", "gl" ), ( "video/out/opengl/hwdec_dxva2.c", "gl-win32" ), ( "video/out/opengl/hwdec_vaegl.c", "vaapi-egl" ), @@ -329,13 +336,6 @@ def build(ctx): ( "video/out/opengl/utils.c", "gl" ), ( "video/out/opengl/video.c", "gl" ), ( "video/out/opengl/video_shaders.c", "gl" ), - ( "video/out/opengl/w32.c", "gl-win32" ), - ( "video/out/opengl/angle.c", "egl-angle" ), - ( "video/out/opengl/dxinterop.c", "gl-dxinterop" ), - ( "video/out/opengl/wayland.c", "gl-wayland" ), - ( "video/out/opengl/x11.c", "gl-x11" ), - ( "video/out/opengl/x11egl.c", "egl-x11" ), - ( "video/out/opengl/drm_egl.c", "egl-drm" ), ( "video/out/vo.c" ), ( "video/out/vo_caca.c", "caca" ), ( "video/out/vo_drm.c", "drm" ), |