fix dependencies stuff

This commit is contained in:
Rasmus Karlsson 2017-06-06 11:18:16 +02:00
parent fa914c152a
commit 196bbace85
3 changed files with 17 additions and 6 deletions

View file

@ -159,12 +159,6 @@ win32 {
INCLUDEPATH += C:\local\boost\ INCLUDEPATH += C:\local\boost\
} }
# Include settings library
SOURCES += lib/settings/src/settings/settingdata.cpp
SOURCES += lib/settings/src/settings/settingmanager.cpp
INCLUDEPATH += lib/settings/include/
INCLUDEPATH += lib/settings/external/signals/include/
# Optional dependency on windows sdk 7.1 # Optional dependency on windows sdk 7.1
win32:exists(C:\Program Files\Microsoft SDKs\Windows\v7.1\Include\Windows.h) { win32:exists(C:\Program Files\Microsoft SDKs\Windows\v7.1\Include\Windows.h) {
LIBS += -L"C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib" \ LIBS += -L"C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib" \
@ -194,3 +188,7 @@ werr {
message("Enabling error on warning") message("Enabling error on warning")
} }
# External dependencies
include(dependencies/rapidjson.pri)
include(dependencies/settings.pri)

4
dependencies/rapidjson.pri vendored Normal file
View file

@ -0,0 +1,4 @@
# rapidjson
win32 {
INCLUDEPATH += C:/local/rapidjson/
}

9
dependencies/settings.pri vendored Normal file
View file

@ -0,0 +1,9 @@
# settings
SOURCES += \
$$PWD/../lib/settings/src/settings/settingdata.cpp \
$$PWD/../lib/settings/src/settings/settingmanager.cpp
INCLUDEPATH += $$PWD/../lib/settings/include/
# signals
INCLUDEPATH += $$PWD/../lib/settings/external/signals/include