diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -3112,7 +3112,7 @@ Additional options: $XCBY -xcb ............... Compile Xcb support. $EGLFSN -no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support. - $EGLFSY -eglfs ............. Compile EGLFS support. + $EGLFSY -eglfs ............. Compile EGLFS support (Requires OpenGL ES 2 support). $DFBN -no-directfb ....... Do not compile DirectFB support. $DFBY -directfb .......... Compile DirectFB support. @@ -3873,6 +3873,11 @@ if [ "$CFG_EGLFS" = "yes" ]; then echo "The EGLFS plugin requires EGL support and cannot be built" exit 101 fi + if [ "$CFG_OPENGL" != "es2" ]; then + echo "The EGLFS plugin requires OpenGL ES 2 support and cannot be built" + exit 101 + fi + CFG_OPENGL="es2" CFG_EGL=yes fi @@ -4614,7 +4619,11 @@ elif [ "$CFG_OPENGL" = "desktop" ]; then fi if [ "$CFG_EGLFS" != "no" ]; then - CFG_EGLFS="$CFG_EGL" + if [ "$CFG_OPENGL" = "es2" ]; then + CFG_EGLFS="$CFG_EGL" + else + CFG_EGLFS="no" + fi fi if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then @@ -4641,8 +4650,8 @@ if [ "$BUILD_ON_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ]; then ( [ "$ORIG_CFG_XCB" = "auto" ] || [ "$ORIG_CFG_EGLFS" = "auto" ] || [ "$ORIG_CFG_DIRECTFB" = "auto" ] ); then echo "No QPA platform plugin enabled!" echo " If you really want to build without a QPA platform plugin you must pass" - echo " -no-xcb, -no-eglfs and -no-directfb to configure. Doing this will" - echo " produce a Qt that cannot run GUI applications." + echo " -no-qpa-platform-guard to configure. Doing this will" + echo " produce a Qt that can not run GUI applications." echo " The dependencies needed for xcb to build are listed in" echo " src/plugins/platforms/xcb/README" exit 1 |