From cfc61b1e393fe4dbccb1940f35fae429a4a5272a Mon Sep 17 00:00:00 2001 From: John Wason Date: Mon, 18 Jul 2022 18:17:19 -0400 Subject: [PATCH] [bullet3] Add bullet3 features double-precision and rtti, enable several extras (#25784) * Add bullet3 features double-precision and rtti, enable a few extras * [bullet3] bump port-version, format, x-add-version * [bullet3] bump port-version * Update version database * [bullet3] reduce port-version * Update version database --- ports/bullet3/portfile.cmake | 11 +++++++++-- ports/bullet3/vcpkg.json | 7 +++++++ versions/b-/bullet3.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 4c70019d30..685d44da1d 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -13,6 +13,9 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES multithreading BULLET2_MULTITHREADING + double-precision USE_DOUBLE_PRECISION + INVERTED_FEATURES + rtti USE_MSVC_DISABLE_RTTI ) vcpkg_cmake_configure( @@ -21,9 +24,13 @@ vcpkg_cmake_configure( -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON -DBUILD_CPU_DEMOS=OFF -DBUILD_BULLET2_DEMOS=OFF + -DBUILD_OPENGL3_DEMOS=OFF -DBUILD_BULLET3=OFF - -DBUILD_EXTRAS=OFF - -DBUILD_UNIT_TESTS=OFF + -DBUILD_EXTRAS=ON + -DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF + -DBUILD_BULLET_ROBOTICS_EXTRA=OFF + -DBUILD_GIMPACTUTILS_EXTRA=OFF + -DBUILD_UNIT_TESTS=OFF -DINSTALL_LIBS=ON ${FEATURE_OPTIONS} ) diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index 50853901d1..d9a5b050fa 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bullet3", "version": "3.22", + "port-version": 1, "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", "license": "Zlib", @@ -15,8 +16,14 @@ } ], "features": { + "double-precision": { + "description": "Use float64 doubles for bullet3" + }, "multithreading": { "description": "Multithreading functionality for bullet3" + }, + "rtti": { + "description": "Enable RTTI on windows" } } } diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 073216c264..96aed05e6a 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f5ea7c8c35304edd8b2eadb5b60b7300a97b772", + "version": "3.22", + "port-version": 1 + }, { "git-tree": "d196c1956b370bd43889ddf5279600092e1af718", "version": "3.22", diff --git a/versions/baseline.json b/versions/baseline.json index 036396614a..522e2e7c78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1202,7 +1202,7 @@ }, "bullet3": { "baseline": "3.22", - "port-version": 0 + "port-version": 1 }, "bustache": { "baseline": "1.1.0",