diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 07675e121..665a44d17 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -368,6 +368,7 @@ if(Qt5_FOUND) libcockatrice_network libcockatrice_models libcockatrice_rng + libcockatrice_settings ${COCKATRICE_QT_MODULES} ) else() @@ -379,6 +380,7 @@ else() libcockatrice_network libcockatrice_models libcockatrice_rng + libcockatrice_settings ${COCKATRICE_QT_MODULES} ) endif() diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp index 68980f1c6..c032d3ca0 100644 --- a/cockatrice/src/client/settings/cache_settings.cpp +++ b/cockatrice/src/client/settings/cache_settings.cpp @@ -1,6 +1,5 @@ #include "cache_settings.h" -#include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h" #include "../network/update/client/release_channel.h" #include "card_counter_settings.h" @@ -12,6 +11,7 @@ #include #include #include +#include #include QSharedPointer SettingsCache::settingsInstance = nullptr; diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h index 1e49ab32e..929092bd7 100644 --- a/tests/carddatabase/mocks.h +++ b/tests/carddatabase/mocks.h @@ -10,7 +10,8 @@ #define PICTURELOADER_H -#include <../../cockatrice/src/client/settings/cache_settings.h> +#include "../../cockatrice/src/client/settings/cache_settings.h" + #include #include