diff --git a/mob.ini b/mob.ini index 4f9feb9..1b7fdb9 100644 --- a/mob.ini +++ b/mob.ini @@ -97,7 +97,7 @@ vs_year = 2022 vs_toolset = 14.3 sdk = 10.0.22621.0 sevenz = 23.01 -boost = 1.82.0 +boost = 1.83.0 boost_vs = 14.3 fmt = 8.1.1 gtest = main @@ -105,15 +105,15 @@ libloot = 0.19.4 lz4 = v1.9.4 nmm = 0.71.2 openssl = 3.1.2 -pyqt = 6.5.2 +pyqt = 6.5.0 pyqt_builder = 1.15.2 pyqt_sip = 13.5.2 -python = v3.10.12 +python = v3.11.5 pybind11 = v2.10.4 bzip2 = 1.0.8 sip = 6.7.11 spdlog = v1.10.0 -qt = 6.5.2 +qt = 6.5.0 qt_vs = 2019 zlib = v1.3 libbsarch = 0.0.9 @@ -126,8 +126,8 @@ ss_paper_mono_6788 = 2.2 ss_dark_mode_1809_6788 = 3.0 ss_morrowind_trosski = 1.1 ss_skyrim_trosski = v1.1 -ss_fallout3_trosski = v1.1 -ss_fallout4_trosski = v1.1 +ss_fallout3_trosski = v1.11 +ss_fallout4_trosski = v1.11 [paths] third_party = diff --git a/patches/python/sources/openssl.props.patch b/patches/python/sources/openssl.props.patch index a8495d9..d60f6cb 100644 --- a/patches/python/sources/openssl.props.patch +++ b/patches/python/sources/openssl.props.patch @@ -1,10 +1,10 @@ --- PCbuild/openssl.props (revision 5c02a39a0b31a330e06b4d6f44835afb205dc7cc) +++ PCbuild/openssl.props (date 1575994670797) @@ -13,6 +13,7 @@ - <_DLLSuffix>-1_1 + <_DLLSuffix>-3 <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 + <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64 + $(_DLLSuffix) - <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" /> diff --git a/src/tasks/libffi.cpp b/src/tasks/libffi.cpp index c2eb202..ab26d3e 100644 --- a/src/tasks/libffi.cpp +++ b/src/tasks/libffi.cpp @@ -39,7 +39,7 @@ void libffi::do_fetch() { run_tool(make_git() .url(make_git_url("python","cpython-bin-deps")) - .branch("libffi-3.3.0") + .branch("libffi-3.4.4") .root(source_path())); }