Skip to content

Commit

Permalink
Another fix for Ruby/Python-less builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
klayoutmatthias committed Nov 7, 2017
1 parent 4a81e22 commit 20a6c5e
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 6 deletions.
25 changes: 22 additions & 3 deletions src/buddies/src/bd/bd.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
}


25 changes: 22 additions & 3 deletions src/buddies/src/buddy_app.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 20a6c5e

Please sign in to comment.