diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-11-26 19:00:01 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-21 21:53:05 +0200 |
| commit | 6cb13bafa083432b5eb8f164f3d420e6a6ef9e90 (patch) | |
| tree | bc5639ad0307280e01e10956a9bdbd78a14e131e | |
| parent | 834ce96df4501478e2152ae4e72cb286ebea1d01 (diff) | |
| download | ptxdist-6cb13bafa083432b5eb8f164f3d420e6a6ef9e90.tar.gz ptxdist-6cb13bafa083432b5eb8f164f3d420e6a6ef9e90.tar.xz | |
[qt4] OpenGL support
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/qt4.in | 26 | ||||
| -rw-r--r-- | rules/qt4.make | 31 |
2 files changed, 54 insertions, 3 deletions
diff --git a/rules/qt4.in b/rules/qt4.in index 6bd788e71..027de09ef 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -14,6 +14,7 @@ menuconfig QT4 select GSTREAMER if QT4_BUILD_PHONON select GST_PLUGINS_BASE if QT4_BUILD_PHONON select OPENSSL if QT4_OPENSSL + select MESALIB if QT4_OPENGL_DESKTOP select ALSA_LIB if QT4_BUILD_MULTIMEDIA # libsvga is currently not in ptxdist # select LIBSVGA if QT4_GFX_SVGA_PLUGIN @@ -156,7 +157,6 @@ choice config QT4_GFX_POWERVR_PLUGIN bool prompt "plugin " - depends on BROKEN help Load the driver at runtime endchoice @@ -679,6 +679,30 @@ endchoice endmenu +choice + prompt "OpenGL support " + help + Add Qt support for OpenGL + +config QT4_OPENGL_NONE + bool "none " + +config QT4_OPENGL_DESKTOP + bool "Desktop " + depends on QT4_PLATFORM_X11 + +config QT4_OPENGL_ES1 + bool "ES 1.x " + +config QT4_OPENGL_ES1CL + bool "ES 1.x CL" + +config QT4_OPENGL_ES2 + bool "ES 2.x " + +endchoice + + menu "optional libraries " config QT4_BUILD_GUI diff --git a/rules/qt4.make b/rules/qt4.make index 90898d5bd..7abd49998 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -124,7 +124,6 @@ QT4_AUTOCONF += \ -xplatform linux-ptx-g++ \ -no-gtkstyle \ -no-nas-sound \ - -no-opengl \ -no-openvg endif @@ -170,7 +169,7 @@ endif # powervr graphics driver ifdef PTXCONF_QT4_GFX_POWERVR_PLUGIN -QT4_AUTOCONF += -plugin-powervr-ahi +QT4_AUTOCONF += -plugin-gfx-powervr endif # svga graphics driver @@ -461,6 +460,22 @@ ifdef PTXCONF_QT4_DBUS_NONE QT4_AUTOCONF += -no-qdbus endif +ifdef PTXCONF_QT4_OPENGL_DESKTOP +QT4_AUTOCONF += -opengl +endif +ifdef PTXCONF_QT4_OPENGL_ES1 +QT4_AUTOCONF += -opengl es1 +endif +ifdef PTXCONF_QT4_OPENGL_ES1CL +QT4_AUTOCONF += -opengl es1cl +endif +ifdef PTXCONF_QT4_OPENGL_ES2 +QT4_AUTOCONF += -opengl es2 +endif +ifdef PTXCONF_QT4_OPENGL_NONE +QT4_AUTOCONF += -no-opengl +endif + ifdef PTXCONF_QT4_SHARED QT4_AUTOCONF += -shared QT4_PLUGIN_EXT := so @@ -801,6 +816,18 @@ ifdef PTXCONF_QT4_GFX_QVFB_PLUGIN @$(call install_copy, qt4, 0, 0, 0644, -, \ /usr/plugins/gfxdrivers/libqscreenvfb.$(QT4_PLUGIN_EXT)) endif +ifdef PTXCONF_QT4_GFX_POWERVR_PLUGIN + @$(call install_copy, qt4, 0, 0, 0644, -, \ + /usr/plugins/gfxdrivers/libqgfxpvregl.$(QT4_PLUGIN_EXT)) + @$(call install_copy, qt4, 0, 0, 0644, -, \ + /usr/lib/libpvrQWSWSEGL.so.1.0.0) + @$(call install_link, qt4, libpvrQWSWSEGL.so.1.0.0, \ + /usr/lib/libpvrQWSWSEGL.so.1.0) + @$(call install_link, qt4, libpvrQWSWSEGL.so.1.0.0, \ + /usr/lib/libpvrQWSWSEGL.so.1) + @$(call install_link, qt4, libpvrQWSWSEGL.so.1.0.0, \ + /usr/lib/libpvrQWSWSEGL.so) +endif ifneq ($(PTXCONF_QT4_DBUS_LOAD)$(PTXCONF_QT4_DBUS_LINK),) @$(call install_copy, qt4, 0, 0, 0644, -, \ /usr/plugins/script/libqtscriptdbus.$(QT4_PLUGIN_EXT)) |