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

pkg-config
This commit is contained in:
Jørgen Lind 2011-03-22 12:13:29 +01:00
parent e5df2dd4c5
commit abb03aa734
3 changed files with 13 additions and 8 deletions

View File

@ -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 \

View File

@ -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
View File

@ -0,0 +1,9 @@
INCLUDEPATH += $$PWD
use_pkgconfig {
CONFIG += link_pkgconfig
PKGCONFIG += libffi
} else {
LIBS += -L $$PWD/../../../../lib/ -lffi
INCLUDEPATH += $$PWD/../ffi
}