diff --git a/ports/joltphysics/disable-warningC5266.patch b/ports/joltphysics/disable-warningC5266.patch deleted file mode 100644 index fb9ce84586c..00000000000 --- a/ports/joltphysics/disable-warningC5266.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt -index 27c4c64..78f3947 100644 ---- a/Build/CMakeLists.txt -+++ b/Build/CMakeLists.txt -@@ -53,7 +53,7 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA - endif() - - # Set general compiler flags -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX- /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi") - - # Remove any existing compiler flag that enables RTTI - string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake index 7f5ebeac075..cb51f23fd95 100644 --- a/ports/joltphysics/portfile.cmake +++ b/ports/joltphysics/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jrouwe/JoltPhysics REF "v${VERSION}" - SHA512 c5848fe7a28de1b34259d3d21e4cd35bec4002eee926445e05d902934c43ab4cafcfa24ceb037c59cc66c3dcea5f3a737546f88c20be594dafe6ce6d1f637abb + SHA512 367e5b945e8f91a0c0c9eb699db6f49351aa39b0af9b8fd0be5f474d65b28a7244880eedad10cbd2db0e031daa28bbabb5f9fb8bf9af653dd1f86904bfde44a2 HEAD_REF master - PATCHES - disable-warningC5266.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT) @@ -22,6 +20,7 @@ vcpkg_cmake_configure( -DTARGET_VIEWER=OFF -DCROSS_PLATFORM_DETERMINISTIC=OFF -DUSE_STATIC_MSVC_RUNTIME_LIBRARY=${USE_STATIC_CRT} + -DENABLE_ALL_WARNINGS=OFF OPTIONS_RELEASE -DCMAKE_BUILD_TYPE=Distribution ) diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json index d7fc3986c4b..786bd7f6678 100644 --- a/ports/joltphysics/vcpkg.json +++ b/ports/joltphysics/vcpkg.json @@ -1,7 +1,6 @@ { "name": "joltphysics", - "version": "2.0.1", - "port-version": 2, + "version": "3.0.1", "description": "A multi core friendly rigid body physics and collision detection library suitable for games and VR applications", "homepage": "https://github.com/jrouwe/JoltPhysics", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3637516ca7a..2d06f203fd2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3393,8 +3393,8 @@ "port-version": 2 }, "joltphysics": { - "baseline": "2.0.1", - "port-version": 2 + "baseline": "3.0.1", + "port-version": 0 }, "josuttis-jthread": { "baseline": "2020-07-21", diff --git a/versions/j-/joltphysics.json b/versions/j-/joltphysics.json index 8b953f90f40..1041f77e1a9 100644 --- a/versions/j-/joltphysics.json +++ b/versions/j-/joltphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa3834efa767ca95d2a0f7b367fe4f154101a35e", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "845755ddfb9fa5d6f88c836cffdb1f497e69ad46", "version": "2.0.1",