feedc0de/DbSoftware
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Include paths are now relative and bumped package versions

Browse Source
This commit is contained in:
0xFEEDC0DE64
2018-09-18 22:09:41 +02:00
committed by Daniel Brunner
parent 7809ed0997
commit 52e96eab2a
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DbPicSync

Submodule DbPicSync updated: 2a52477436...562c4f429a

7
DbSoftware.pro
View File

@@ -7,9 +7,10 @@ SUBDIRS += 3rdparty \
DbNeuralNet \ DbNeuralNet \
DbPathFinder \ DbPathFinder \
DbPicSync \ DbPicSync \
DbRadioDumper \ DbRadioDumper
DbSerialServer \ qtHaveModule(serialport): SUBDIRS += DbSerialServer
DbSketch \ else: message("serialport is missing, will not build DbSerialServer")
SUBDIRS += DbSketch \
DbTernaryClock \ DbTernaryClock \
DbTictactoe \ DbTictactoe \
DbWebserver \ DbWebserver \

2
DbZeiterfassung

Submodule DbZeiterfassung updated: 9f7af8487f...29db99a918

40
project.pri
View File

@@ -18,53 +18,53 @@ for(DBLIB, DBLIBS) {
equals(DBLIB, "dbcore") { equals(DBLIB, "dbcore") {
LIBS += -ldbcore LIBS += -ldbcore
INCLUDEPATH += $$PWD/libs/DbCoreLib INCLUDEPATH += $${PROJECT_ROOT}/libs/DbCoreLib
DEPENDPATH += $$PWD/libs/DbCoreLib DEPENDPATH += $${PROJECT_ROOT}/libs/DbCoreLib
} else: equals(DBLIB, "dbgui") { } else: equals(DBLIB, "dbgui") {
LIBS += -ldbgui LIBS += -ldbgui
INCLUDEPATH += $$PWD/libs/DbGuiLib INCLUDEPATH += $${PROJECT_ROOT}/libs/DbGuiLib
DEPENDPATH += $$PWD/libs/DbGuiLib DEPENDPATH += $${PROJECT_ROOT}/libs/DbGuiLib
} else: equals(DBLIB, "dbnetwork") { } else: equals(DBLIB, "dbnetwork") {
LIBS += -ldbnetwork LIBS += -ldbnetwork
INCLUDEPATH += $$PWD/libs/DbNetworkLib INCLUDEPATH += $${PROJECT_ROOT}/libs/DbNetworkLib
DEPENDPATH += $$PWD/libs/DbNetworkLib DEPENDPATH += $${PROJECT_ROOT}/libs/DbNetworkLib
} else: equals(DBLIB, "messaginglib") { } else: equals(DBLIB, "messaginglib") {
LIBS += -lmessaginglib LIBS += -lmessaginglib
INCLUDEPATH += $$PWD/DbMessaging/messaginglib INCLUDEPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib
DEPENDPATH += $$PWD/DbMessaging/messaginglib DEPENDPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib
} else: equals(DBLIB, "neuralnetlib") { } else: equals(DBLIB, "neuralnetlib") {
LIBS += -lneuralnetlib LIBS += -lneuralnetlib
INCLUDEPATH += $$PWD/DbNeuralNet/neuralnetlib INCLUDEPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib
DEPENDPATH += $$PWD/DbNeuralNet/neuralnetlib DEPENDPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib
} else: equals(DBLIB, "sketchlib") { } else: equals(DBLIB, "sketchlib") {
LIBS += -lsketchlib LIBS += -lsketchlib
INCLUDEPATH += $$PWD/DbSketch/sketchlib INCLUDEPATH += $${PROJECT_ROOT}/DbSketch/sketchlib
DEPENDPATH += $$PWD/DbSketch/sketchlib DEPENDPATH += $${PROJECT_ROOT}/DbSketch/sketchlib
} else: equals(DBLIB, "webserverlib") { } else: equals(DBLIB, "webserverlib") {
LIBS += -lwebserverlib LIBS += -lwebserverlib
INCLUDEPATH += $$PWD/DbWebserver/webserverlib INCLUDEPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib
DEPENDPATH += $$PWD/DbWebserver/webserverlib DEPENDPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib
} else: equals(DBLIB, "zeiterfassungcore") { } else: equals(DBLIB, "zeiterfassungcore") {
LIBS += -lzeiterfassungcore LIBS += -lzeiterfassungcore
INCLUDEPATH += $$PWD/DbZeiterfassung/zeiterfassungcorelib INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib
DEPENDPATH += $$PWD/DbZeiterfassung/zeiterfassungcorelib DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib
} else: equals(DBLIB, "zeiterfassunggui") { } else: equals(DBLIB, "zeiterfassunggui") {
LIBS += -lzeiterfassunggui LIBS += -lzeiterfassunggui
INCLUDEPATH += $$PWD/DbZeiterfassung/zeiterfassungguilib INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib
DEPENDPATH += $$PWD/DbZeiterfassung/zeiterfassungguilib DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib
} else: equals(DBLIB, "quazip") { } else: equals(DBLIB, "quazip") {
LIBS += -lquazip LIBS += -lquazip
INCLUDEPATH += $$PWD/3rdparty/Quazip INCLUDEPATH += $${PROJECT_ROOT}/3rdparty/Quazip
DEPENDPATH += $$PWD/3rdparty/Quazip DEPENDPATH += $${PROJECT_ROOT}/3rdparty/Quazip
} else: message("ERROR: Unknown dblib $$DBLIB") } else: message("ERROR: Unknown dblib $$DBLIB")
} }