diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 674bc661..89b31011 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -686,11 +686,6 @@ else() target_compile_options(supercell-wx PRIVATE "$<$:-g>") endif() -# link atomic only for Linux -if (!MSVC) - target_link_libraries(scwx-qt PUBLIC atomic) -endif() - target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::OpenGLWidgets Qt${QT_VERSION_MAJOR}::Multimedia @@ -699,6 +694,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Svg Boost::json Boost::timer + Boost::atomic QMapLibre::Core $<$:opengl32> $<$:SetupAPI> diff --git a/scwx-qt/source/scwx/qt/util/queue_counter.cpp b/scwx-qt/source/scwx/qt/util/queue_counter.cpp index 929229e2..39b9fb9d 100644 --- a/scwx-qt/source/scwx/qt/util/queue_counter.cpp +++ b/scwx-qt/source/scwx/qt/util/queue_counter.cpp @@ -1,6 +1,6 @@ #include -#include +#include namespace scwx::qt::util { @@ -10,8 +10,8 @@ class QueueCounter::Impl public: explicit Impl(size_t maxCount) : maxCount_ {maxCount} {} - const size_t maxCount_; - std::atomic count_ {0}; + const size_t maxCount_; + boost::atomic count_ {0}; }; QueueCounter::QueueCounter(size_t maxCount) : diff --git a/scwx-qt/source/scwx/qt/util/queue_counter.hpp b/scwx-qt/source/scwx/qt/util/queue_counter.hpp index c540ec63..471bd645 100644 --- a/scwx-qt/source/scwx/qt/util/queue_counter.hpp +++ b/scwx-qt/source/scwx/qt/util/queue_counter.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace scwx::qt::util { @@ -54,7 +54,7 @@ public: * otherwise */ static constexpr bool is_always_lock_free = - std::atomic::is_always_lock_free; + boost::atomic::is_always_lock_free; private: class Impl;