diff --git a/ports/joltphysics/fix-export.diff b/ports/joltphysics/fix-export.diff index 7fb2ea0496..ec744038b0 100644 --- a/ports/joltphysics/fix-export.diff +++ b/ports/joltphysics/fix-export.diff @@ -13,17 +13,6 @@ index 830453f..5c9f155 100644 set(CMAKE_CXX_FLAGS_DISTRIBUTION "/GS- /Gy /O2 /Oi /Ot") set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address /Od") set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all") -@@ -184,8 +184,8 @@ else() - - # Set compiler flags for various configurations - if (OVERRIDE_CXX_FLAGS) -- set(CMAKE_CXX_FLAGS_DEBUG "") -- set(CMAKE_CXX_FLAGS_RELEASE "-O3") -+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") - endif() - set(CMAKE_CXX_FLAGS_DISTRIBUTION "${CMAKE_CXX_FLAGS_RELEASE}") - set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address") @@ -232,7 +232,11 @@ if (XCODE) endif() diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake index 98a0193229..9b3f7d7374 100644 --- a/ports/joltphysics/portfile.cmake +++ b/ports/joltphysics/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_cmake_configure( -DINTERPROCEDURAL_OPTIMIZATION=OFF -DUSE_STATIC_MSVC_RUNTIME_LIBRARY=${USE_STATIC_CRT} -DENABLE_ALL_WARNINGS=OFF + -DOVERRIDE_CXX_FLAGS=OFF OPTIONS_RELEASE -DGENERATE_DEBUG_SYMBOLS=OFF -DDEBUG_RENDERER_IN_DEBUG_AND_RELEASE=OFF diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json index e4cc909d8a..2bf6bb134a 100644 --- a/ports/joltphysics/vcpkg.json +++ b/ports/joltphysics/vcpkg.json @@ -1,6 +1,7 @@ { "name": "joltphysics", "version": "5.0.0", + "port-version": 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 699998b477..7be8dbf59b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3730,7 +3730,7 @@ }, "joltphysics": { "baseline": "5.0.0", - "port-version": 0 + "port-version": 1 }, "josuttis-jthread": { "baseline": "2020-07-21", diff --git a/versions/j-/joltphysics.json b/versions/j-/joltphysics.json index 959855e93e..66da8bd1b2 100644 --- a/versions/j-/joltphysics.json +++ b/versions/j-/joltphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f81fed7d87903aa8a4be3619dce4cc64596aad5d", + "version": "5.0.0", + "port-version": 1 + }, { "git-tree": "9f3c7087c8c79ef501b33872b730510d2a0a2b2b", "version": "5.0.0",