diff options
| author | Koen Kooi <k-kooi@ti.com> | 2010-03-28 18:46:42 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-04-12 19:43:30 +0200 |
| commit | 596ae3d677d5b1c96377d3c9f5c95fe18de4f68d (patch) | |
| tree | 718e3e4d78b6b6da188dca0113f5ee1995c41a5c | |
| parent | b1b0975762a7d0eb3028ace0ee2a3b7eff9ee8aa (diff) | |
QT4 gles: also allow ES1 builds, like ES2 needs undocumented magic
| -rw-r--r-- | recipes/qt4/qt4-embedded-gles/linux.conf | 8 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free-gles/linux.conf | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/recipes/qt4/qt4-embedded-gles/linux.conf b/recipes/qt4/qt4-embedded-gles/linux.conf index 12b5633f57..8c099a6439 100644 --- a/recipes/qt4/qt4-embedded-gles/linux.conf +++ b/recipes/qt4/qt4-embedded-gles/linux.conf @@ -12,10 +12,12 @@ QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) QMAKE_INCDIR_EGL = ${STAGING_INCDIR}/GLES2 -QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES +QMAKE_INCDIR_OPENGL_ES1 = ${STAGING_INCDIR}/GLES QMAKE_INCDIR_OPENGL_ES2 = ${STAGING_INCDIR}/GLES2 QMAKE_LIBDIR_EGL = ${STAGING_LIBDIR} QMAKE_LIBDIR_OPENGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL_ES1 = ${STAGING_LIBDIR} QMAKE_LIBDIR_OPENGL_ES2 = ${STAGING_LIBDIR} QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 @@ -24,7 +26,9 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um -QMAKE_LIBS_OPENGL_QT = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL = -lEGL -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL_ES1 = -lEGL -lGLES_CM -lIMGegl -lsrv_um QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um QMAKE_LIBS_THREAD = -lpthread diff --git a/recipes/qt4/qt4-x11-free-gles/linux.conf b/recipes/qt4/qt4-x11-free-gles/linux.conf index b825e5dc16..ef641f54a9 100644 --- a/recipes/qt4/qt4-x11-free-gles/linux.conf +++ b/recipes/qt4/qt4-x11-free-gles/linux.conf @@ -12,10 +12,12 @@ QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) QMAKE_INCDIR_EGL = ${STAGING_INCDIR}/GLES2 -QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES +QMAKE_INCDIR_OPENGL_ES1 = ${STAGING_INCDIR}/GLES QMAKE_INCDIR_OPENGL_ES2 = ${STAGING_INCDIR}/GLES2 QMAKE_LIBDIR_EGL = ${STAGING_LIBDIR} QMAKE_LIBDIR_OPENGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL_ES1 = ${STAGING_LIBDIR} QMAKE_LIBDIR_OPENGL_ES2 = ${STAGING_LIBDIR} QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 @@ -24,7 +26,9 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um -QMAKE_LIBS_OPENGL_QT = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL = -lEGL -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL_ES1 = -lEGL -lGLES_CM -lIMGegl -lsrv_um QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um QMAKE_LIBS_THREAD = -lpthread @@ -56,4 +60,6 @@ QMAKE_MKDIR = mkdir -p QMAKE_INSTALL_FILE = install -m 644 -p QMAKE_INSTALL_PROGRAM = install -m 755 -p +DEFINES += QT_NO_OPENVG + include(unix.conf) |