diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-04-15 09:59:56 (GMT) |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-04-15 10:31:37 (GMT) |
| commit | 9f6146dd3a7c111923e79c490c9504f39b205f0b (patch) | |
| tree | 960202c00c9893361b8e1cc7d457a97e938b4cdc | |
| parent | e0706ca2fbce063c263bad9a1eee24f057f170bd (diff) | |
| download | Qt-9f6146dd3a7c111923e79c490c9504f39b205f0b.zip Qt-9f6146dd3a7c111923e79c490c9504f39b205f0b.tar.gz Qt-9f6146dd3a7c111923e79c490c9504f39b205f0b.tar.bz2 | |
BT: OpenGL ES 2.0 now compiles properly for Windows CE
glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform
Reviewed-by: Tom Cooksey
| -rw-r--r-- | src/opengl/opengl.pro | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 48d7caf..78aaddb 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -25,18 +25,16 @@ HEADERS += qgl.h \ qglcolormap.h \ qglpixelbuffer.h \ qglframebufferobject.h \ - qglpixmapfilter_p.h SOURCES += qgl.cpp \ qglcolormap.cpp \ qglpixelbuffer.cpp \ qglframebufferobject.cpp \ qglextensions.cpp \ - qglpixmapfilter.cpp !contains(QT_CONFIG, opengles2) { - HEADERS += qpaintengine_opengl_p.h - SOURCES += qpaintengine_opengl.cpp + HEADERS += qpaintengine_opengl_p.h qglpixmapfilter_p.h + SOURCES += qpaintengine_opengl.cpp qglpixmapfilter.cpp } contains(QT_CONFIG, opengles2) { @@ -130,6 +128,10 @@ wince*: { contains(QT_CONFIG,opengles1cl) { QMAKE_LIBS += "libGLES_CL.lib" } + contains(QT_CONFIG,opengles2) { + QMAKE_LIBS += "libGLESv2.lib" + } + } else { QMAKE_LIBS += $$QMAKE_LIBS_OPENGL } |