From 196bbace852038132b8e55e4aadb413f4c60abd1 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Tue, 6 Jun 2017 11:18:16 +0200 Subject: [PATCH] fix dependencies stuff --- chatterino.pro | 10 ++++------ dependencies/rapidjson.pri | 4 ++++ dependencies/settings.pri | 9 +++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 dependencies/rapidjson.pri create mode 100644 dependencies/settings.pri diff --git a/chatterino.pro b/chatterino.pro index 3e98092d..73f86d4f 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -159,12 +159,6 @@ win32 { 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 win32:exists(C:\Program Files\Microsoft SDKs\Windows\v7.1\Include\Windows.h) { LIBS += -L"C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib" \ @@ -194,3 +188,7 @@ werr { message("Enabling error on warning") } + +# External dependencies +include(dependencies/rapidjson.pri) +include(dependencies/settings.pri) diff --git a/dependencies/rapidjson.pri b/dependencies/rapidjson.pri new file mode 100644 index 00000000..e51b2f16 --- /dev/null +++ b/dependencies/rapidjson.pri @@ -0,0 +1,4 @@ +# rapidjson +win32 { + INCLUDEPATH += C:/local/rapidjson/ +} diff --git a/dependencies/settings.pri b/dependencies/settings.pri new file mode 100644 index 00000000..6c179035 --- /dev/null +++ b/dependencies/settings.pri @@ -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