Fix build failed with ANGLE
Added eglext_angle.h and gl2ext_angle.h to the list of header files copied to include/QtANGLE during install. These two header files were introduced by the recent ANGLE update but were not added to the install. This was causing build failures when including the ANGLE headers (e.g. in qtmultimedia). Task-number: QTBUG-71158 Change-Id: If2f1a9ecfcdf509cccf2b3671adf575cc39892d4 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
parent
03b1380613
commit
8727bbd800
@ -766,6 +766,7 @@ khr_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/KHR
|
||||
gles2_headers.files = \
|
||||
$$ANGLE_DIR/include/GLES2/gl2.h \
|
||||
$$ANGLE_DIR/include/GLES2/gl2ext.h \
|
||||
$$ANGLE_DIR/include/GLES2/gl2ext_angle.h \
|
||||
$$ANGLE_DIR/include/GLES2/gl2platform.h
|
||||
gles2_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/GLES2
|
||||
gles3_headers.files = \
|
||||
|
@ -21,6 +21,7 @@ SOURCES += \
|
||||
egl_headers.files = \
|
||||
$$ANGLE_DIR/include/EGL/egl.h \
|
||||
$$ANGLE_DIR/include/EGL/eglext.h \
|
||||
$$ANGLE_DIR/include/EGL/eglext_angle.h \
|
||||
$$ANGLE_DIR/include/EGL/eglplatform.h
|
||||
egl_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/EGL
|
||||
INSTALLS += egl_headers
|
||||
|
@ -80,7 +80,7 @@
|
||||
);
|
||||
|
||||
@qpa_headers = ( qr/^(?!qplatformheaderhelper)qplatform/, qr/^qwindowsystem/ );
|
||||
my @angle_headers = ('egl.h', 'eglext.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h');
|
||||
my @angle_headers = ('egl.h', 'eglext.h', 'eglext_angle.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2ext_angle.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h');
|
||||
my @internal_zlib_headers = ( "crc32.h", "deflate.h", "gzguts.h", "inffast.h", "inffixed.h", "inflate.h", "inftrees.h", "trees.h", "zutil.h" );
|
||||
my @zlib_headers = ( "zconf.h", "zlib.h" );
|
||||
@ignore_headers = ( @internal_zlib_headers );
|
||||
|
Loading…
x
Reference in New Issue
Block a user