Merge pull request #755 from jmiskovic/fix/jolt_win

Allow joltc fns without explicit argument list
2024-03-04 11:54:10 -08:00 · 2024-03-04 19:03:22 +01:00
1 changed files with 6 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -186,10 +186,12 @@ if(LOVR_ENABLE_PHYSICS)
      set(LOVR_PHYSICS_LIB ode)
    endif()
  elseif(LOVR_PHYSICS_LIBRARY STREQUAL "JOLT")
-    if(NOT MSVC)
-      set(BUILD_SHARED_LIBS OFF)
-      include_directories(deps/jolt-physics-sharp/src/joltc)
-      add_subdirectory(deps/jolt-physics-sharp/src/joltc 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)