Merge branch 'master' into build

This commit is contained in:
Nigel Stewart 2011-03-11 15:32:03 -06:00
commit d55270566d

View File

@ -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