diff --git a/CMakeLists.txt b/CMakeLists.txt index bc5abbf0..7894e09c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,13 +16,13 @@ endif(SHARED_SFML) # initialize conan libs include(CMake/conan.cmake) conan_cmake_run(REQUIRES - boost/1.77.0 + boost/1.84.0 ogg/1.3.5 - sfml/2.5.1 - spdlog/1.9.2 - nlohmann_json/3.10.5 + sfml/2.6.1 + spdlog/1.14.1 + nlohmann_json/3.11.3 lua/5.4.3 - zlib/1.2.12 + zlib/1.3.1 BASIC_SETUP CMAKE_TARGETS GENERATORS cmake_find_package cmake_paths BUILD missing diff --git a/src/Item.cpp b/src/Item.cpp index 7de6f6fa..21ab788e 100644 --- a/src/Item.cpp +++ b/src/Item.cpp @@ -126,7 +126,9 @@ void from_json(const nl::json& j, ItemCallbacks& cbs) { if (j.contains("onSelect")) { - j["onSelect"].get_to(cbs.onSelect); + std::string s; + j["onSelect"].get_to(s); + cbs.onSelect = s; } } diff --git a/src/ItemFactory.cpp b/src/ItemFactory.cpp index 0664bb22..ec17359a 100644 --- a/src/ItemFactory.cpp +++ b/src/ItemFactory.cpp @@ -1,3 +1,5 @@ +#include + #include #include diff --git a/src/ResourceManager.cpp b/src/ResourceManager.cpp index f714ffc1..cbe6ba60 100644 --- a/src/ResourceManager.cpp +++ b/src/ResourceManager.cpp @@ -1,3 +1,4 @@ +#include #include #include "ResourceManager.h" diff --git a/src/Scenes/HackerTerminal.cpp b/src/Scenes/HackerTerminal.cpp index 3b095a52..022d3990 100644 --- a/src/Scenes/HackerTerminal.cpp +++ b/src/Scenes/HackerTerminal.cpp @@ -23,7 +23,10 @@ std::string getHackerText() boost::posix_time::ptime tl = boost::posix_time::second_clock::local_time(); output << "$> scp ~/* root@166.89.64.107:/subject_t/backups/" - << fmt::format("{:04}-{:02}-{:02}", tl.date().year(), tl.date().month(), tl.date().day()) + << fmt::format("{:04}-{:02}-{:02}", + static_cast(tl.date().year()), + static_cast(tl.date().month()), + static_cast(tl.date().day())) << std::endl << std::endl; diff --git a/src/Settings.cpp b/src/Settings.cpp index 7505cdfd..c5fc4da7 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -1,7 +1,7 @@ // Ash Crypto // Copyright (c) 2017-2020, Adalid Claure -#include +#include #include #include @@ -88,9 +88,9 @@ void Settings::save(std::string_view filename) _currentFile = filename; - boost::filesystem::ofstream out; + std::ofstream out; out.open(filename.data(), - boost::filesystem::ofstream::out | boost::filesystem::ofstream::trunc); + std::ofstream::out | std::ofstream::trunc); out << std::setw(4) << _settings; out.close(); diff --git a/src/VehicleFactory.cpp b/src/VehicleFactory.cpp index 57b4769e..1cc07407 100644 --- a/src/VehicleFactory.cpp +++ b/src/VehicleFactory.cpp @@ -1,3 +1,5 @@ +#include + #include #include