Merge commit '2df5a9538197c2a43300f2001c0fb75e5e5863c4' into dev

2024-09-18 20:44:28 +02:00
parent 0eba0a522c 2df5a95381
commit b191ed7396
14 changed files with 162 additions and 78 deletions
--- a/external/imgui/examples/example_glfw_wgpu/CMakeLists.txt
+++ b/external/imgui/examples/example_glfw_wgpu/CMakeLists.txt
@@ -79,6 +79,11 @@ add_executable(example_glfw_wgpu
  ${IMGUI_DIR}/imgui_tables.cpp
  ${IMGUI_DIR}/imgui_widgets.cpp
 )
+IF(NOT EMSCRIPTEN)
+  target_compile_definitions(example_glfw_wgpu PUBLIC
+    "IMGUI_IMPL_WEBGPU_BACKEND_DAWN"
+  )
+endif()
 target_include_directories(example_glfw_wgpu PUBLIC
  ${IMGUI_DIR}
  ${IMGUI_DIR}/backends