From 20a6c5ec6b700f01fe4e08a76f59e4fbbc4c8bfd Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 7 Nov 2017 20:48:15 +0100 Subject: [PATCH] Another fix for Ruby/Python-less builds. --- src/buddies/src/bd/bd.pro | 25 ++++++++++++++++++++++--- src/buddies/src/buddy_app.pri | 25 ++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/buddies/src/bd/bd.pro b/src/buddies/src/bd/bd.pro index 2abbb6d1e..1b80e94f2 100644 --- a/src/buddies/src/bd/bd.pro +++ b/src/buddies/src/bd/bd.pro @@ -31,7 +31,26 @@ HEADERS = \ RESOURCES = \ -INCLUDEPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$RBA_INC $$PYA_INC $$LIB_INC $$RDB_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$RBA_INC $$PYA_INC $$LIB_INC $$RDB_INC -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_rba -lklayout_pya -lklayout_lib -lklayout_rdb +INCLUDEPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lib -lklayout_rdb + +INCLUDEPATH += $$RBA_INC +DEPENDPATH += $$RBA_INC + +equals(HAVE_RUBY, "1") { + LIBS += -lklayout_rba +} else { + LIBS += -lklayout_rbastub +} + +INCLUDEPATH += $$PYA_INC +DEPENDPATH += $$PYA_INC + +equals(HAVE_PYTHON, "1") { + LIBS += -lklayout_pya +} else { + LIBS += -lklayout_pyastub +} + diff --git a/src/buddies/src/buddy_app.pri b/src/buddies/src/buddy_app.pri index 483be0dea..644bb5944 100644 --- a/src/buddies/src/buddy_app.pri +++ b/src/buddies/src/buddy_app.pri @@ -11,8 +11,27 @@ include($$PWD/../../app.pri) # place - it's not part of the bd sources. SOURCES = $$PWD/bd/main.cc -INCLUDEPATH += $$BD_INC $$TL_INC $$RBA_INC $$GSI_INC -DEPENDPATH += $$BD_INC $$TL_INC $$RBA_INC $$GSI_INC -LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_pya -lklayout_rba -lklayout_lib -lklayout_rdb +INCLUDEPATH += $$BD_INC $$TL_INC $$GSI_INC +DEPENDPATH += $$BD_INC $$TL_INC $$GSI_INC +LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lib -lklayout_rdb + +INCLUDEPATH += $$RBA_INC +DEPENDPATH += $$RBA_INC + +equals(HAVE_RUBY, "1") { + LIBS += -lklayout_rba +} else { + LIBS += -lklayout_rbastub +} + +INCLUDEPATH += $$PYA_INC +DEPENDPATH += $$PYA_INC + +equals(HAVE_PYTHON, "1") { + LIBS += -lklayout_pya +} else { + LIBS += -lklayout_pyastub +} + DEFINES += BD_TARGET=$$TARGET