diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake index 552f25868e..22522ae39e 100644 --- a/ports/joltphysics/portfile.cmake +++ b/ports/joltphysics/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jrouwe/JoltPhysics @@ -45,4 +43,25 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(PACKAGE_NAME Jolt CONFIG_PATH "lib/cmake/Jolt") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/Jolt/Core/Core.h" + "#pragma once" + [=[#pragma once + +#ifndef JPH_SHARED_LIBRARY +#define JPH_SHARED_LIBRARY +#endif +#ifndef JPH_FLOATING_POINT_EXCEPTIONS_ENABLED +#define JPH_FLOATING_POINT_EXCEPTIONS_ENABLED +#endif +#ifndef JPH_USE_CPU_COMPUTE +#define JPH_USE_CPU_COMPUTE +#endif +#ifndef JPH_OBJECT_STREAM +#define JPH_OBJECT_STREAM +#endif]=] + ) +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json index 150a2b3eb8..d4e2b916d1 100644 --- a/ports/joltphysics/vcpkg.json +++ b/ports/joltphysics/vcpkg.json @@ -1,6 +1,7 @@ { "name": "joltphysics", "version": "5.6.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 2cae99be17..44d12dcf04 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4190,7 +4190,7 @@ }, "joltphysics": { "baseline": "5.6.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 9ef676c149..35dcb135f7 100644 --- a/versions/j-/joltphysics.json +++ b/versions/j-/joltphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "459e842b1521f5c365acaf110a7a1635f201569c", + "version": "5.6.0", + "port-version": 1 + }, { "git-tree": "2eab0b6e73bfbe491fa0ffb297fd3ffdb6bf4ecf", "version": "5.6.0",