diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-06-24 02:55:06 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-06-24 02:55:06 (GMT) |
| commit | 871364bf2475cf3b2a9c5535b59dab41db184ef4 (patch) | |
| tree | 724bacc13f16cfa236d6069cd8ae7089954e290c /mkspecs | |
| parent | 0570b26f90f031b09970f8fca1a67339b66ee33f (diff) | |
| download | Qt-871364bf2475cf3b2a9c5535b59dab41db184ef4.zip Qt-871364bf2475cf3b2a9c5535b59dab41db184ef4.tar.gz Qt-871364bf2475cf3b2a9c5535b59dab41db184ef4.tar.bz2 | |
Better detection for OpenVG engines that run on top of OpenGL
ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags
on the link line if it is needed by the OpenVG engine.
Reviewed-by: trustme
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/linux.conf | 3 | ||||
| -rw-r--r-- | mkspecs/features/unix/openvg.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/win32/openvg.prf | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index fa84841..cc5c38b 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -15,6 +15,8 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib QMAKE_INCDIR_EGL = QMAKE_LIBDIR_EGL = +QMAKE_INCDIR_OPENVG = +QMAKE_LIBDIR_OPENVG = QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl @@ -24,6 +26,7 @@ QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL +QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread QMAKE_MOC = $$[QT_INSTALL_BINS]/moc diff --git a/mkspecs/features/unix/openvg.prf b/mkspecs/features/unix/openvg.prf index 7bd7fbe..a21d1ca 100644 --- a/mkspecs/features/unix/openvg.prf +++ b/mkspecs/features/unix/openvg.prf @@ -1,3 +1,9 @@ !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG !isEmpty(QMAKE_LIBDIR_OPENVG): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENVG !isEmpty(QMAKE_LIBS_OPENVG): LIBS += $QMAKE_LIBS_OPENVG + +contains(QT_CONFIG, openvg_on_opengl) { + !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + !isEmpty(QMAKE_LIBDIR_OPENGL): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENGL + !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $QMAKE_LIBS_OPENGL +} diff --git a/mkspecs/features/win32/openvg.prf b/mkspecs/features/win32/openvg.prf index d4aa296..0df5b66 100644 --- a/mkspecs/features/win32/openvg.prf +++ b/mkspecs/features/win32/openvg.prf @@ -1,3 +1,7 @@ QMAKE_LIBS += $$QMAKE_LIBS_OPENVG QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENVG +contains(QT_CONFIG, openvg_on_opengl) { + QMAKE_LIBS += $$QMAKE_LIBS_OPENGL + QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL +} |