From 9ecaa1ce962a063b7dc9b7a7a9fa45b71ba5ce63 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 9 Nov 2023 20:15:30 -0600 Subject: [PATCH] Dependency update - boost 1.83.0 - cpr 1.10.4 - freetype 2.13.0 - glm cci.20230113 - gtest 1.14.0 - libxml2 2.10.4 - openssl 3.1.4 - spdlog 1.12.0 - sqlite 3.44.0 - vulkan-loader 1.3.243.0 - zlib 1.3 - onetbb 2021.10.0 - aws-sdk-cpp 1.11.199 - date cc4685a - freetype-gl 65b746d - stb beebb24 --- conanfile.py | 24 +++++++++---------- external/aws-sdk-cpp | 2 +- external/date | 2 +- external/freetype-gl | 2 +- external/stb | 2 +- .../scwx/qt/manager/placefile_manager.cpp | 2 ++ 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/conanfile.py b/conanfile.py index af9b5b90..5b15bcad 100644 --- a/conanfile.py +++ b/conanfile.py @@ -2,21 +2,21 @@ class SupercellWxConan(ConanFile): settings = ("os", "compiler", "build_type", "arch") - requires = ("boost/1.81.0", - "cpr/1.9.3", + requires = ("boost/1.83.0", + "cpr/1.10.4", "fontconfig/2.14.2", - "freetype/2.12.1", + "freetype/2.13.0", "geographiclib/1.52", "glew/2.2.0", - "glm/cci.20220420", - "gtest/1.13.0", + "glm/cci.20230113", + "gtest/1.14.0", "libcurl/7.86.0", - "libxml2/2.10.3", - "openssl/3.1.0", - "spdlog/1.11.0", - "sqlite3/3.40.1", - "vulkan-loader/1.3.236.0", - "zlib/1.2.13") + "libxml2/2.10.4", + "openssl/3.1.4", + "spdlog/1.12.0", + "sqlite3/3.44.0", + "vulkan-loader/1.3.243.0", + "zlib/1.3") generators = ("cmake", "cmake_find_package", "cmake_paths") @@ -26,7 +26,7 @@ class SupercellWxConan(ConanFile): def requirements(self): if self.settings.os == "Linux": - self.requires("onetbb/2021.9.0") + self.requires("onetbb/2021.10.0") def imports(self): self.copy("*.dll", dst="bin", src="bin") diff --git a/external/aws-sdk-cpp b/external/aws-sdk-cpp index 197a6dfd..50401cd2 160000 --- a/external/aws-sdk-cpp +++ b/external/aws-sdk-cpp @@ -1 +1 @@ -Subproject commit 197a6dfde08071bec386518eb1aa1631903d198d +Subproject commit 50401cd2c87eb32e13e5acc1e0b11ce0edf2b088 diff --git a/external/date b/external/date index 50acf3ff..cc4685a2 160000 --- a/external/date +++ b/external/date @@ -1 +1 @@ -Subproject commit 50acf3ffd8b09deeec6980be824f2ac54a50b095 +Subproject commit cc4685a21e4a4fdae707ad1233c61bbaff241f93 diff --git a/external/freetype-gl b/external/freetype-gl index 41193bc9..65b746d3 160000 --- a/external/freetype-gl +++ b/external/freetype-gl @@ -1 +1 @@ -Subproject commit 41193bc9200993215c3a22b107be60fa964c7422 +Subproject commit 65b746d300e1b67033795ebb794b093eeae3b4d0 diff --git a/external/stb b/external/stb index 5736b15f..beebb24b 160000 --- a/external/stb +++ b/external/stb @@ -1 +1 @@ -Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 +Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7 diff --git a/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp b/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp index 4b1b0550..8ab8f146 100644 --- a/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp @@ -1,3 +1,5 @@ +#define NOMINMAX + #include #include #include