diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2012-02-28 10:00:32 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-13 18:15:26 +0200 |
| commit | 19524b7499c0a4b6f66d4797f04f06e140234149 (patch) | |
| tree | 6e077c6d3732227df896a418f18082f81bdecc76 /src | |
| parent | 6fc44c59263a19b6697de980c70e085f0f2922c4 (diff) | |
directfb: Integrate building into configure.
Add DirectFB buildsystem integration by adding a configure target
and adding it as subdirectory to the project file. The default is
to automatically build directfb. Update the Broadcom/9425 build.
Change-Id: I482f865cebd9d5cd4c98c184773f8534f92db9df
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/directfb/directfb.pro | 14 | ||||
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 2251b8f278..5dfddeb225 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -4,15 +4,8 @@ DESTDIR = $$QT.gui.plugins/platforms QT += core-private gui-private platformsupport-private -isEmpty(DIRECTFB_LIBS) { - DIRECTFB_LIBS = -ldirectfb -lfusion -ldirect -lpthread -} -isEmpty(DIRECTFB_INCLUDEPATH) { - DIRECTFB_INCLUDEPATH = /usr/include/directfb -} - -INCLUDEPATH += $$DIRECTFB_INCLUDEPATH -LIBS += $$DIRECTFB_LIBS +LIBS += $$QMAKE_LIBS_DIRECTFB +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DIRECTFB SOURCES = main.cpp \ qdirectfbintegration.cpp \ @@ -44,6 +37,9 @@ directfb_egl { HEADERS += $$DIRECTFB_PLATFORM_HOOKS_HEADERS SOURCES += $$DIRECTFB_PLATFORM_HOOKS_SOURCES DEFINES += DIRECTFB_PLATFORM_HOOKS + LIBS += $$DIRECTFB_PLATFORM_HOOKS_LIBS + QMAKE_LIBDIR += $$DIRECTFB_PLATFORM_HOOKS_LIBDIR + INCLUDEPATH += $$DIRECTFB_PLATFORM_HOOKS_INCLUDEPATH } else { SOURCES += qdirectfbeglhooks_stub.cpp } diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index 1321270dc6..51de06f910 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -17,3 +17,7 @@ qnx { contains(QT_CONFIG, eglfs) { SUBDIRS += eglfs } + +contains(QT_CONFIG, directfb) { + SUBDIRS += directfb +} |