Fix how wayland is compiled so that we can pick up libffi from

pkg-config

diff --git a/src/3rdparty/wayland/client/client.pro b/src/3rdparty/wayland/client/client.pro
index ebf24b4..71af897 100644 (file)
--- 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 2c1788c..da2bf36 100644 (file)
--- 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 (file)
index 0000000..44194dc
--- /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
+}