Skip to content

Commit 4ddabb3

Browse files
committed
Update Jolt to hopefully allow windows to link.
1 parent d7063ef commit 4ddabb3

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

attachments/advanced_gltf/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,13 @@ FetchContent_Declare(
7878
GIT_REPOSITORY https://github.com/jrouwe/JoltPhysics.git
7979
GIT_TAG v5.2.0
8080
SOURCE_SUBDIR Build)
81-
set(DOUBLE_PRECISION OFF CACHE BOOL "" FORCE)
82-
set(GENERATE_DEBUG_SYMBOLS ON CACHE BOOL "" FORCE)
83-
set(PROFILE_ENABLED ON CACHE BOOL "" FORCE)
81+
set(DOUBLE_PRECISION OFF CACHE BOOL "" FORCE)
82+
set(GENERATE_DEBUG_SYMBOLS ON CACHE BOOL "" FORCE)
83+
set(PROFILER_IN_DEBUG_AND_RELEASE ON CACHE BOOL "" FORCE)
84+
set(DEBUG_RENDERER_IN_DEBUG_AND_RELEASE ON CACHE BOOL "" FORCE)
85+
set(ENABLE_OBJECT_STREAM ON CACHE BOOL "" FORCE)
86+
set(FLOATING_POINT_EXCEPTIONS_ENABLED ON CACHE BOOL "" FORCE)
87+
set(INTERPROCEDURAL_OPTIMIZATION ON CACHE BOOL "" FORCE)
8488
if(MSVC)
8589
set(USE_STATIC_MSVC_RUNTIME_LIBRARY OFF CACHE BOOL "" FORCE)
8690
endif()
@@ -255,9 +259,6 @@ if(MSVC)
255259

256260
# Enable Link Time Code Generation to match Jolt and resolve potential LTO mismatches
257261
set_target_properties(SimpleEngineLib PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
258-
259-
# Jolt configuration consistency
260-
target_compile_definitions(SimpleEngineLib PUBLIC JPH_PROFILE_ENABLED JPH_EXTERNAL_PROFILE)
261262
elseif(WIN32)
262263
target_compile_definitions(SimpleEngineLib PUBLIC
263264
NOMINMAX WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_WARNINGS)
@@ -283,7 +284,6 @@ target_link_libraries(AdvancedGLTF PRIVATE
283284

284285
if(MSVC)
285286
set_target_properties(AdvancedGLTF PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
286-
target_compile_definitions(AdvancedGLTF PRIVATE JPH_PROFILE_ENABLED JPH_EXTERNAL_PROFILE)
287287
endif()
288288

289289
# Ensure all shaders (from simple_engine and local) are in the executable's shader directory.

0 commit comments

Comments
 (0)