From 88099c8617717fab763ca3f5a641831395e8db58 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 22 Nov 2013 20:58:48 +0100 Subject: build: add a gdi check for windows Incidentally this seems wrong in the configure as well because only gl-win32 depends on it instead of also making direct3d depend on this (as I did here). --- wscript | 6 ++++++ wscript_build.py | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index dabf630875..d2e3070de5 100644 --- a/wscript +++ b/wscript @@ -447,6 +447,10 @@ video_output_features = [ fragment=load_fragment('cocoa.m'), compile_filename='test.m', framework_name=['Cocoa', 'IOKit', 'OpenGL']) + } , { + 'name': 'gdi', + 'desc': 'GDI', + 'func': check_cc(lib='gdi32') } , { 'name': '--wayland', 'desc': 'Wayland', @@ -510,6 +514,7 @@ video_output_features = [ } , { 'name': '--gl-win32', 'desc': 'OpenGL Win32 Backend', + 'deps': [ 'gdi' ], 'func': check_statement('windows.h', 'wglCreateContext(0)', lib='opengl32') } , { @@ -571,6 +576,7 @@ video_output_features = [ }, { 'name': '--direct3d', 'desc': 'Direct3D support', + 'deps': [ 'gdi' ], 'func': check_cc(header_name='d3d9.h'), } ] diff --git a/wscript_build.py b/wscript_build.py index c20d235522..58a2e29039 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -359,8 +359,7 @@ def build(ctx): ( "video/out/vo_wayland.c", "wayland" ), ( "video/out/vo_x11.c" , "x11" ), ( "video/out/vo_xv.c", "xv" ), - ( "video/out/w32_common.c", "os-win32" ), - ( "video/out/w32_common.c", "os-cygwin" ), + ( "video/out/w32_common.c", "gdi" ), ( "video/out/wayland_common.c", "wayland" ), ( "video/out/x11_common.c", "x11" ), -- cgit v1.2.3