Commit d5527056 authored by Nigel Stewart's avatar Nigel Stewart
Browse files

Merge branch 'master' into build

parents c57f2e05 c06a90bc
...@@ -61,6 +61,11 @@ EOT ...@@ -61,6 +61,11 @@ EOT
DECLARE_HANDLE(HVIDEOINPUTDEVICENV); DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
EOT EOT
# fix GLX_NV_video_capture
cat >> $1/GLX_NV_video_capture <<EOT
typedef XID GLXVideoCaptureDeviceNV
EOT
# remove duplicates from GL_NV_present_video and GLX_NV_present_video # remove duplicates from GL_NV_present_video and GLX_NV_present_video
grep -v -F -f $1/GLX_NV_present_video $1/GL_NV_present_video > tmp grep -v -F -f $1/GLX_NV_present_video $1/GL_NV_present_video > tmp
mv tmp $1/GL_NV_present_video mv tmp $1/GL_NV_present_video
......
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