[box2d] update to 3.1.1 (#45874)

This commit is contained in:
toge 2025-06-10 08:07:36 +09:00 committed by GitHub
parent 8cf609585d
commit cf6cca6e81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 26 deletions

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4b62d3..f0ed3f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,6 @@ message(STATUS "CMake C++ compiler: ${CMAKE_CXX_COMPILER_ID}")
message(STATUS "CMake system name: ${CMAKE_SYSTEM_NAME}")
message(STATUS "CMake host system processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
-# static link
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
if (MSVC OR APPLE)
option(BOX2D_SANITIZE "Enable sanitizers for some builds" OFF)

View File

@ -1,18 +1,11 @@
vcpkg_download_distfile(
werror_patch
URLS https://github.com/erincatto/Box2D/commit/0f2b0246f39594e93fcc8dde0fe0bb1b20b403f9.patch?full_index=1
SHA512 debe1bae799909ad51a1a69d79843e1d4bfcd86257057de1c09c79479bd5e4714b9ae78e593f854868af568b459a24de29a369d04e6f280fcb233398e486bac3
FILENAME erincatto-Box2D-0f2b024.diff
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO erincatto/Box2D
REF v${VERSION}
SHA512 85d67a0de92aecc61692d7a6f1a8c7e878cdd2a6457470f1a9be075dfc27fdcefb951ac689d95bb78a7b791d6586f794720af8417f55d7f66782b4c3c179210a
SHA512 7367640e7f2ff395b8ca48766c71f57c96e08c298627c996eba76899a149ee28b0e3ecacfa4a224fdb5d160c7e25c6069bb8414fd1575787727d796097aa347b
HEAD_REF main
PATCHES
${werror_patch}
crt-linkage.diff
libm.diff
)

View File

@ -1,7 +1,6 @@
{
"name": "box2d",
"version-semver": "3.1.0",
"port-version": 1,
"version-semver": "3.1.1",
"description": "An open source C++ engine for simulating rigid bodies in 2D",
"homepage": "https://box2d.org",
"supports": "!uwp",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "81f894b99ba686f428b3d80e7769ee04f8bf548e",
"version-semver": "3.1.1",
"port-version": 0
},
{
"git-tree": "ea3872a71bce39d614f49e382dd66eb091387217",
"version-semver": "3.1.0",

View File

@ -1413,8 +1413,8 @@
"port-version": 0
},
"box2d": {
"baseline": "3.1.0",
"port-version": 1
"baseline": "3.1.1",
"port-version": 0
},
"braft": {
"baseline": "2021-26-04",