Skip to content

Commit

Permalink
Dependency update
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
dpaulat committed Nov 10, 2023
1 parent 9a70c37 commit 9ecaa1c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
24 changes: 12 additions & 12 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion external/aws-sdk-cpp
Submodule aws-sdk-cpp updated 12490 files
2 changes: 1 addition & 1 deletion external/date
2 changes: 2 additions & 0 deletions scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 9ecaa1c

Please sign in to comment.