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
This commit is contained in:
Dan Paulat 2023-11-09 20:15:30 -06:00
parent 9a70c37ccd
commit 9ecaa1ce96
6 changed files with 18 additions and 16 deletions

View file

@ -2,21 +2,21 @@ from conans import ConanFile
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")

@ -1 +1 @@
Subproject commit 197a6dfde08071bec386518eb1aa1631903d198d
Subproject commit 50401cd2c87eb32e13e5acc1e0b11ce0edf2b088

2
external/date vendored

@ -1 +1 @@
Subproject commit 50acf3ffd8b09deeec6980be824f2ac54a50b095
Subproject commit cc4685a21e4a4fdae707ad1233c61bbaff241f93

@ -1 +1 @@
Subproject commit 41193bc9200993215c3a22b107be60fa964c7422
Subproject commit 65b746d300e1b67033795ebb794b093eeae3b4d0

2
external/stb vendored

@ -1 +1 @@
Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9
Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7

View file

@ -1,3 +1,5 @@
#define NOMINMAX
#include <scwx/qt/manager/placefile_manager.hpp>
#include <scwx/qt/manager/font_manager.hpp>
#include <scwx/qt/manager/resource_manager.hpp>