summaryrefslogtreecommitdiffstats
path: root/wscript_build.py
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-30 12:27:15 +0200
committerwm4 <wm4@nowhere>2017-06-30 18:57:37 +0200
commitdd408e68ed57fa5130bef976751e58a5d6e42f75 (patch)
tree7b47f293f3a07b318289ac277bcba6c588f0e586 /wscript_build.py
parentc61520b6bd51d2ab8ba1fa14d89170844ebd159b (diff)
downloadmpv-dd408e68ed57fa5130bef976751e58a5d6e42f75.tar.bz2
mpv-dd408e68ed57fa5130bef976751e58a5d6e42f75.tar.xz
d3d: make DXVA2 support optional
This partially reverts the change from a longer time ago to always build DXVA2 and D3D11VA together. To make it simpler, we change the following: - building with ANGLE headers is now required to build D3D hwaccels - if DXVA2 is enabled, D3D11VA is still forcibly built - the CLI vo_opengl ANGLE backend is now under --egl-angle-win32 This is done to reduce the dependency mess slightly.
Diffstat (limited to 'wscript_build.py')
-rw-r--r--wscript_build.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/wscript_build.py b/wscript_build.py
index 3a98cf96ac..7ecd14bd9f 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -325,10 +325,10 @@ def build(ctx):
( "video/vdpau.c", "vdpau" ),
( "video/vdpau_mixer.c", "vdpau" ),
( "video/vt.c", "videotoolbox-hwaccel" ),
- ( "video/decode/d3d.c", "win32-desktop" ),
+ ( "video/decode/d3d.c", "d3d-hwaccel" ),
( "video/decode/dec_video.c"),
( "video/decode/hw_cuda.c", "cuda-hwaccel" ),
- ( "video/decode/hw_dxva2.c", "d3d-hwaccel" ),
+ ( "video/decode/hw_dxva2.c", "d3d9-hwaccel" ),
( "video/decode/hw_d3d11va.c", "d3d-hwaccel" ),
( "video/decode/hw_videotoolbox.c", "videotoolbox-hwaccel" ),
( "video/decode/vd_lavc.c" ),
@@ -366,7 +366,7 @@ def build(ctx):
( "video/out/opengl/angle_dynamic.c", "egl-angle" ),
( "video/out/opengl/common.c", "gl" ),
( "video/out/opengl/context.c", "gl" ),
- ( "video/out/opengl/context_angle.c", "egl-angle" ),
+ ( "video/out/opengl/context_angle.c", "egl-angle-win32" ),
( "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" ),
@@ -382,10 +382,10 @@ def build(ctx):
( "video/out/opengl/formats.c", "gl" ),
( "video/out/opengl/hwdec.c", "gl" ),
( "video/out/opengl/hwdec_cuda.c", "cuda-hwaccel" ),
- ( "video/out/opengl/hwdec_d3d11egl.c", "egl-angle" ),
- ( "video/out/opengl/hwdec_d3d11eglrgb.c","egl-angle" ),
- ( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop" ),
- ( "video/out/opengl/hwdec_dxva2egl.c", "egl-angle" ),
+ ( "video/out/opengl/hwdec_d3d11egl.c", "d3d-hwaccel" ),
+ ( "video/out/opengl/hwdec_d3d11eglrgb.c","d3d-hwaccel" ),
+ ( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop-d3d9" ),
+ ( "video/out/opengl/hwdec_dxva2egl.c", "d3d9-hwaccel" ),
( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ),
( "video/out/opengl/hwdec_ios.m", "ios-gl" ),
( "video/out/opengl/hwdec_rpi.c", "rpi" ),