Fix how wayland is compiled so that we can pick up libffi from
pkg-config
This commit is contained in:
parent
e5df2dd4c5
commit
abb03aa734
6
src/3rdparty/wayland/client/client.pro
vendored
6
src/3rdparty/wayland/client/client.pro
vendored
@ -4,11 +4,9 @@ DESTDIR=$$PWD/../../../../lib/
|
|||||||
|
|
||||||
CONFIG -= qt
|
CONFIG -= qt
|
||||||
CONFIG += shared
|
CONFIG += shared
|
||||||
|
CONFIG += use_pkgconfig
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/.. \
|
include(../shared.pri)
|
||||||
$$PWD/../../ffi
|
|
||||||
|
|
||||||
LIBS += -L $$PWD/../../../../lib/ -lffi
|
|
||||||
|
|
||||||
SOURCES = ../wayland-client.c \
|
SOURCES = ../wayland-client.c \
|
||||||
../wayland-protocol.c \
|
../wayland-protocol.c \
|
||||||
|
6
src/3rdparty/wayland/server/server.pro
vendored
6
src/3rdparty/wayland/server/server.pro
vendored
@ -4,11 +4,9 @@ DESTDIR=$$PWD/../../../../lib/
|
|||||||
|
|
||||||
CONFIG -= qt
|
CONFIG -= qt
|
||||||
CONFIG += shared
|
CONFIG += shared
|
||||||
|
CONFIG += use_pkgconfig
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/.. \
|
include(../shared.pri)
|
||||||
$$PWD/../../ffi
|
|
||||||
|
|
||||||
LIBS += -L $$PWD/../../../../lib/ -lffi
|
|
||||||
|
|
||||||
SOURCES = ../event-loop.c \
|
SOURCES = ../event-loop.c \
|
||||||
../wayland-server.c \
|
../wayland-server.c \
|
||||||
|
9
src/3rdparty/wayland/shared.pri
vendored
Normal file
9
src/3rdparty/wayland/shared.pri
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
INCLUDEPATH += $$PWD
|
||||||
|
|
||||||
|
use_pkgconfig {
|
||||||
|
CONFIG += link_pkgconfig
|
||||||
|
PKGCONFIG += libffi
|
||||||
|
} else {
|
||||||
|
LIBS += -L $$PWD/../../../../lib/ -lffi
|
||||||
|
INCLUDEPATH += $$PWD/../ffi
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user