AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust egl config.test to pass sysrooted libs

Browse Source 
We should really start using -L=/foo and -I=/foo inside of sysroots,

this test was preventing us from doing so (while arguably buying us
nothing).

Change-Id: If6e67631c585493871231e5d8a9354fa72e07343
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Donald Carr 2016-03-30 10:35:51 -07:00 committed by Donald Carr
parent a8f98959ef
commit 2693ca59e1
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/qpa/egl-x11/egl-x11.pro
View File

@ -1,7 +1,7 @@
SOURCES = egl-x11.cpp
for(p, QMAKE_LIBDIR_EGL) {
exists($$p):LIBS += -L$$p
LIBS += -L$$p
}
!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL

2
config.tests/qpa/egl/egl.pro
View File

@ -1,7 +1,7 @@
SOURCES = egl.cpp
for(p, QMAKE_LIBDIR_EGL) {
exists($$p):LIBS += -L$$p
LIBS += -L$$p
}
!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL

2
config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
View File

@ -5,7 +5,7 @@ CONFIG -= qt
INCLUDEPATH += $$QMAKE_INCDIR_EGL
for(p, QMAKE_LIBDIR_EGL) {
exists($$p):LIBS += -L$$p
LIBS += -L$$p
}
LIBS += -lEGL -lGLESv2 -lbcm_host

2
config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
View File

@ -1,7 +1,7 @@
SOURCES = eglfs-egldevice.cpp
for(p, QMAKE_LIBDIR_EGL) {
exists($$p):LIBS += -L$$p
LIBS += -L$$p
}
INCLUDEPATH += $$QMAKE_INCDIR_EGL

2
config.tests/unix/opengles2/opengles2.pro
View File

@ -2,7 +2,7 @@ SOURCES = opengles2.cpp
INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
for(p, QMAKE_LIBDIR_OPENGL_ES2) {
exists($$p):LIBS += -L$$p
LIBS += -L$$p
}
CONFIG -= qt

2
config.tests/unix/opengles3/opengles3.pro
View File

@ -6,7 +6,7 @@ SOURCES = opengles3.cpp
INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
for(p, QMAKE_LIBDIR_OPENGL_ES2) {
exists($$p):LIBS += -L$$p
LIBS += -L$$p
}
CONFIG -= qt

2
config.tests/unix/opengles31/opengles31.pro
View File

@ -6,7 +6,7 @@ SOURCES = opengles31.cpp
INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
for(p, QMAKE_LIBDIR_OPENGL_ES2) {
exists($$p):LIBS += -L$$p
LIBS += -L$$p
}
CONFIG -= qt

2
mkspecs/features/egl.prf
View File

@ -4,5 +4,5 @@ QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL
LIBS += $$QMAKE_LFLAGS_EGL
for(p, QMAKE_LIBDIR_EGL) {
exists($$p): LIBS_PRIVATE += -L$$p
LIBS_PRIVATE += -L$$p
}