diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-02 18:29:18 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-03 12:50:01 +0100 |
| commit | 49dcd3c75b29d0017f4d28436ea18ea69b712b57 (patch) | |
| tree | d6adfd1585130a3bd32ef4691bf222ad7b75e120 /rules | |
| parent | 9c15dba1ca487e929688bcd6351a782c03896b75 (diff) | |
| download | ptxdist-49dcd3c75b29d0017f4d28436ea18ea69b712b57.tar.gz ptxdist-49dcd3c75b29d0017f4d28436ea18ea69b712b57.tar.xz | |
qt4: cleanup & update patches
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/qt4.in | 8 | ||||
| -rw-r--r-- | rules/qt4.make | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/rules/qt4.in b/rules/qt4.in index df327d2f4..b24cd7db1 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -683,6 +683,9 @@ endchoice endmenu +config QT4_BUILD_OPENGL + bool + choice prompt "OpenGL support " help @@ -694,19 +697,22 @@ config QT4_OPENGL_NONE config QT4_OPENGL_DESKTOP bool "Desktop " depends on QT4_PLATFORM_X11 + select QT4_BUILD_OPENGL config QT4_OPENGL_ES1 bool "ES 1.x " + select QT4_BUILD_OPENGL config QT4_OPENGL_ES1CL bool "ES 1.x CL" + select QT4_BUILD_OPENGL config QT4_OPENGL_ES2 bool "ES 2.x " + select QT4_BUILD_OPENGL endchoice - menu "optional libraries " config QT4_BUILD_GUI diff --git a/rules/qt4.make b/rules/qt4.make index ace63d102..16b8639ce 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -50,6 +50,9 @@ $(STATEDIR)/qt4.extract: -e "s,@INCDIR@,$(SYSROOT)/include $(SYSROOT)/usr/include,g" \ -e "s,@LIBDIR@,$(SYSROOT)/lib $(SYSROOT)/usr/lib,g" \ -e "s#@LDFLAGS@#$(strip $(CROSS_LDFLAGS))#g" \ + -e "s#@QMAKE_LIBS_OPENGL_ES1@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES1))#g" \ + -e "s#@QMAKE_LIBS_OPENGL_ES1CL@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES1CL))#g" \ + -e "s#@QMAKE_LIBS_OPENGL_ES2@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES2))#g" \ $$file > $${file%%.in}; \ done @$(call touch) @@ -706,6 +709,9 @@ endif ifdef PTXCONF_QT4_BUILD_MULTIMEDIA @$(call install_lib, qt4, 0, 0, 0644, libQtMultimedia) endif +ifdef PTXCONF_QT4_BUILD_OPENGL + @$(call install_lib, qt4, 0, 0, 0644, libQtOpenGL) +endif ifdef PTXCONF_QT4_BUILD_PHONON @$(call install_lib, qt4, 0, 0, 0644, libphonon) endif |