diff options
| -rw-r--r-- | conan.lock | 3 | ||||
| -rw-r--r-- | conanfile.py | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -5,7 +5,7 @@ "spdlog/1.12.0#c5fc262786548cbac34e6c38e16309a9%1688915175.09", "lyra/1.6.1#7ec368ee0f9ba9f34ae72e466d2b3b51%1667926079.486", "libpng/1.6.40#3b63a2aa000933a57a53322207790714%1687968865.34", - "libjpeg/9e#68269859e4325ddc3f995d1fd3fc9187%1674953155.168", + "libjpeg-turbo/3.0.0#67120951a18ea4925927f812ead966ed%1688830880.079", "libbacktrace/cci.20210118#ec1aa63bbc10145c6a299e68e711670c%1676205469.545", "fmt/10.0.0#dd5e3eb81b512a1bb34a5aab88a07e82%1684225718.04", "bzip2/1.0.8#411fc05e80d47a89045edc1ee6f23c1d%1678293522.814", @@ -13,6 +13,7 @@ "asio/1.28.1#9b4fb4d434f6b12dc44c116b57f6e25d%1691066750.28" ], "build_requires": [ + "nasm/2.15.05#799d63b1672a337584b09635b0f22fc1%1675256619.737", "cmake/3.27.1#7d5f14447c023feef9f59640be53619a%1691315387.882", "b2/4.9.6#53783bdbbdbb6c13732b25f1f6ea6c58%1686399756.948" ], diff --git a/conanfile.py b/conanfile.py index 7dd7706..8926d87 100644 --- a/conanfile.py +++ b/conanfile.py @@ -30,7 +30,7 @@ class Wanda(ConanFile): "asio/[~1.28]", "boost/[~1.82]", "fmt/[~10.0]", - "libjpeg/9e", + "libjpeg-turbo/[~3.0]", "libpng/[~1.6]", "lyra/[~1.6]", "spdlog/[~1.12]", @@ -82,7 +82,7 @@ class Wanda(ConanFile): # requires "boost::boost", "fmt::fmt", - "libjpeg::libjpeg", + "libjpeg-turbo::jpeg", "libpng::libpng", "spdlog::spdlog", ] |