summaryrefslogtreecommitdiff
path: root/src/3rdparty
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-03-22 12:13:29 +0100
committerJørgen Lind <jorgen.lind@nokia.com>2011-03-22 12:50:02 +0100
commitfe2a6c64bfedfd1df946ad379131847900d821c7 (patch)
treee94cd42eb63963c20690d5cf52c6e1f862ea7623 /src/3rdparty
parente8b2b600aa4d5367a2b549b0c6e1ae9336a7cbfa (diff)
downloadqtwayland-fe2a6c64bfedfd1df946ad379131847900d821c7.tar.gz
Fix how wayland is compiled so that we can pick up libffi from
pkg-config
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/wayland/client/client.pro6
-rw-r--r--src/3rdparty/wayland/server/server.pro6
-rw-r--r--src/3rdparty/wayland/shared.pri9
3 files changed, 13 insertions, 8 deletions
diff --git a/src/3rdparty/wayland/client/client.pro b/src/3rdparty/wayland/client/client.pro
index ebf24b4e..71af897a 100644
--- a/src/3rdparty/wayland/client/client.pro
+++ b/src/3rdparty/wayland/client/client.pro
@@ -4,11 +4,9 @@ DESTDIR=$$PWD/../../../../lib/
CONFIG -= qt
CONFIG += shared
+CONFIG += use_pkgconfig
-INCLUDEPATH += $$PWD/.. \
- $$PWD/../../ffi
-
-LIBS += -L $$PWD/../../../../lib/ -lffi
+include(../shared.pri)
SOURCES = ../wayland-client.c \
../wayland-protocol.c \
diff --git a/src/3rdparty/wayland/server/server.pro b/src/3rdparty/wayland/server/server.pro
index 2c1788ce..da2bf364 100644
--- a/src/3rdparty/wayland/server/server.pro
+++ b/src/3rdparty/wayland/server/server.pro
@@ -4,11 +4,9 @@ DESTDIR=$$PWD/../../../../lib/
CONFIG -= qt
CONFIG += shared
+CONFIG += use_pkgconfig
-INCLUDEPATH += $$PWD/.. \
- $$PWD/../../ffi
-
-LIBS += -L $$PWD/../../../../lib/ -lffi
+include(../shared.pri)
SOURCES = ../event-loop.c \
../wayland-server.c \
diff --git a/src/3rdparty/wayland/shared.pri b/src/3rdparty/wayland/shared.pri
new file mode 100644
index 00000000..44194dca
--- /dev/null
+++ b/src/3rdparty/wayland/shared.pri
@@ -0,0 +1,9 @@
+INCLUDEPATH += $$PWD
+
+use_pkgconfig {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += libffi
+} else {
+ LIBS += -L $$PWD/../../../../lib/ -lffi
+ INCLUDEPATH += $$PWD/../ffi
+}