lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Jolt; 

Seems we can add the root CMake project directly now.
This commit is contained in:
bjorn 2024-03-28 12:58:33 -07:00
parent fd7fe08055
commit f4553075cb
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -186,16 +186,7 @@ if(LOVR_ENABLE_PHYSICS)
set(LOVR_PHYSICS_LIB ode)
endif()
elseif(LOVR_PHYSICS_LIBRARY STREQUAL "JOLT")
set(BUILD_SHARED_LIBS OFF)
include_directories(deps/jolt-physics-sharp/src/joltc)
add_subdirectory(deps/jolt-physics-sharp/src/joltc jolt)
if(MSVC)
target_compile_options(joltc PRIVATE /wd4255)
else()
target_compile_options(joltc PRIVATE -Wno-comment)
endif()
set(PHYSICS_REPO_ROOT ${CMAKE_SOURCE_DIR}/deps/jolt-physics-sharp/src/joltc)
include(deps/jolt-physics-sharp/src/joltc/Jolt/Jolt.cmake)
add_subdirectory(deps/jolt-physics-sharp jolt)
set(LOVR_PHYSICS_LIB joltc)
endif()
endif()

2
deps/jolt-physics-sharp vendored

@ -1 +1 @@
Subproject commit 0d3dcfaf205297856f60e7a7ff87fa34106e16a5
Subproject commit b46d8689ab4c9992e4126e3bafda13b1c72dca04