fixing builds

wkjarosz · Dec 31, 2023 · 890042f · 890042f
1 parent 0cea2b2
commit 890042f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -180,7 +180,7 @@ endif()
 
 # set(HELLOIMGUI_USE_GLFW_METAL ON)
 set(HELLOIMGUI_USE_GLFW_OPENGL3 ON)
-CPMAddPackage("gh:pthom/hello_imgui#0c8e5e848738dd7160485d96da3aa9e9033c62ad")
+CPMAddPackage("gh:pthom/hello_imgui#8abe2c98dbf99e3a098eb5548b0a079c9f4c8a8f")
 if(hello_imgui_ADDED)
   message(STATUS "hello_imgui library added")
 endif()
@@ -331,17 +331,20 @@ set(HELLO_IMGUI_BUNDLE_VERSION ${VERSION})
 set(HELLO_IMGUI_BUNDLE_SHORT_VERSION ${VERSION})
 set(HELLO_IMGUI_BUNDLE_ICON_FILE icon.icns)
 
+if(APPLE AND (HELLOIMGUI_USE_GLFW_METAL OR HELLOIMGUI_USE_SDL_METAL))
+  list(APPEND EXTRA_SOURCES src/renderpass_metal.mm src/shader_metal.mm)
+endif()
+
 hello_imgui_add_app(
   SamplinSafari
   src/app.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/src/common.cpp
   src/opengl_check.cpp
   src/shader.cpp
   src/shader_gl.cpp
-  src/shader_metal.mm
   src/export_to_file.cpp
   src/renderpass_gl.cpp
-  src/renderpass_metal.mm
+  ${EXTRA_SOURCES}
   ASSETS_LOCATION
   ${CMAKE_CURRENT_BINARY_DIR}/assets
 )

diff --git a/src/renderpass_gl.cpp b/src/renderpass_gl.cpp
@@ -5,6 +5,7 @@
 #include "renderpass.h"
 
 #include <fmt/core.h>
+#include <stdexcept>
 
 RenderPass::RenderPass(bool write_depth, bool clear) :
     m_clear(clear), m_clear_color(0, 0, 0, 0), m_clear_depth(1.f), m_viewport_offset(0), m_viewport_size(0),