jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt: fix build with opengl es

Browse Source 
Fixes http://autobuild.buildroot.net/results/efe/efe26c54361094fb1e201da6915900cd9b24d596/

qt doesn't use pkg-config to figure out the needed compiler/linker flags
for egl, so pass them explicitly instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2013-11-29 11:25:25 +01:00
parent 765ccaf08c
commit fe8d728db5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/qt/qt.mk
View File

@ -35,6 +35,7 @@ endif
QT_CFLAGS = $(TARGET_CFLAGS) QT_CFLAGS = $(TARGET_CFLAGS)
QT_CXXFLAGS = $(TARGET_CXXFLAGS) QT_CXXFLAGS = $(TARGET_CXXFLAGS)
QT_LDFLAGS = $(TARGET_LDFLAGS)
ifeq ($(BR2_LARGEFILE),y) ifeq ($(BR2_LARGEFILE),y)
QT_CONFIGURE_OPTS += -largefile QT_CONFIGURE_OPTS += -largefile
@ -320,6 +321,9 @@ endif
ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y) ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
QT_CONFIGURE_OPTS += -opengl es2 -egl QT_CONFIGURE_OPTS += -opengl es2 -egl
QT_DEPENDENCIES += libgles libegl QT_DEPENDENCIES += libgles libegl
QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
else else
QT_CONFIGURE_OPTS += -no-opengl QT_CONFIGURE_OPTS += -no-opengl
endif endif
@ -490,7 +494,7 @@ define QT_CONFIGURE_CMDS
$(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D)) $(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D))
$(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D)) $(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D))
$(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D)) $(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D))
$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(TARGET_LDFLAGS),$(@D)) $(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D))
$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D)) $(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D))
# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
# instead of the host then. So set PKG_CONFIG* manually. # instead of the host then. So set PKG_CONFIG* manually.