[wip] osc support in vst3 on macOS

celtera · Mar 15, 2024 · 6adbeb9 · 6adbeb9
1 parent 4a4f9c4
commit 6adbeb9
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 9 deletions.
diff --git a/cmake/avendish.dependencies.cmake b/cmake/avendish.dependencies.cmake
@@ -41,3 +41,20 @@ if(NOT TARGET pantor::inja)
   )
   FetchContent_MakeAvailable(pantor_inja)
 endif()
+
+if(APPLE)
+if(NOT TARGET jthread)
+FetchContent_Declare(
+  jthread
+  GIT_REPOSITORY "https://github.com/StirlingLabs/jthread"
+  GIT_TAG main
+  GIT_PROGRESS true
+)
+FetchContent_MakeAvailable(jthread)
+endif()
+endif()
+
+
+if(NOT TARGET jthread)
+  add_library(jthread INTERFACE)
+endif()
diff --git a/cmake/avendish.ossia.cmake b/cmake/avendish.ossia.cmake
@@ -67,9 +67,22 @@ function(avnd_make_ossia)
     PUBLIC
       Avendish::Avendish
       ossia::ossia
-      SDL2
   )
 
+  if(TARGET SDL2::SDL2)
+    target_link_libraries(
+      ${AVND_FX_TARGET}
+      PUBLIC
+        SDL2::SDL2
+    )
+  elseif(TARGET SDL2::SDL2-static)
+    target_link_libraries(
+      ${AVND_FX_TARGET}
+      PUBLIC
+        SDL2::SDL2-static
+    )
+  endif()
+
   avnd_common_setup("${AVND_TARGET}" "${AVND_FX_TARGET}")
 
   target_sources(Avendish PRIVATE

diff --git a/cmake/avendish.standalone.cmake b/cmake/avendish.standalone.cmake
@@ -85,7 +85,20 @@ function(avnd_make_standalone)
       ${AVND_FX_TARGET}
       PUBLIC
         ossia::ossia
-        SDL2
+    )
+  endif()
+
+  if(TARGET SDL2::SDL2)
+    target_link_libraries(
+      ${AVND_FX_TARGET}
+      PUBLIC
+        SDL2::SDL2
+    )
+  elseif(TARGET SDL2::SDL2-static)
+    target_link_libraries(
+      ${AVND_FX_TARGET}
+      PUBLIC
+        SDL2::SDL2-static
     )
   endif()
 
@@ -147,6 +160,7 @@ function(avnd_make_standalone)
     ${AVND_FX_TARGET}
     PUBLIC
       Avendish::Avendish
+      jthread
   )
 
   if(TARGET ossia::ossia)

diff --git a/cmake/avendish.vst3.cmake b/cmake/avendish.vst3.cmake
@@ -71,7 +71,7 @@ function(avnd_make_vst3)
     ${AVND_FX_TARGET}
     PUBLIC
       Avendish::Avendish_vst3
-      $<LINK_GROUP:RESCAN,base,sdk_common,pluginterfaces>
+      $<IF:$<BOOL:${APPLE}>,base sdk_common pluginterfaces,$<LINK_GROUP:RESCAN,base,sdk_common,pluginterfaces>>
       DisableExceptions
   )
 
@@ -84,7 +84,7 @@ function(avnd_make_vst3)
   endif()
 
   if(APPLE)
-    target_link_libraries(${AVND_FX_TARGET} PRIVATE "-Wl, -exported_symbols_list ,${CMAKE_BINARY_DIR}/vst3_symbols")
+    target_link_libraries(${AVND_FX_TARGET} PRIVATE jthread "-Wl,-exported_symbols_list,${CMAKE_BINARY_DIR}/vst3_symbols")
   elseif(WIN32)
     if(NOT MSVC)
       target_link_libraries(${AVND_FX_TARGET} PRIVATE "-Wl,--version-script=${CMAKE_BINARY_DIR}/vst3_symbols")

diff --git a/include/avnd/binding/standalone/oscquery_minimal_mapper.hpp b/include/avnd/binding/standalone/oscquery_minimal_mapper.hpp
@@ -18,7 +18,11 @@
 #include <ossia/protocols/oscquery/oscquery_server_asio.hpp>
 
 #include <iostream>
+#include <thread>
 #include <chrono>
+#if __has_include(<jthread>)
+#include <jthread>
+#endif
 namespace standalone
 {
 template <typename T>

diff --git a/include/halp/controls_fmt.hpp b/include/halp/controls_fmt.hpp
@@ -19,7 +19,7 @@ struct formatter<halp::combo_pair<T>>
   }
 
   template <typename FormatContext>
-  auto format(const halp::combo_pair<T>& number, FormatContext& ctx)
+  auto format(const halp::combo_pair<T>& number, FormatContext& ctx) const
   {
     return fmt::format_to(ctx.out(), "combo: {}->{}", number.first, number.second);
   }
@@ -35,7 +35,7 @@ struct formatter<halp::xy_type<T>>
   }
 
   template <typename FormatContext>
-  auto format(const halp::xy_type<T>& number, FormatContext& ctx)
+  auto format(const halp::xy_type<T>& number, FormatContext& ctx) const
   {
     return fmt::format_to(ctx.out(), "xy: {}, {}", number.x, number.y);
   }
@@ -51,7 +51,7 @@ struct formatter<halp::color_type>
   }
 
   template <typename FormatContext>
-  auto format(const halp::color_type& number, FormatContext& ctx)
+  auto format(const halp::color_type& number, FormatContext& ctx) const
   {
     return fmt::format_to(
         ctx.out(), "rgba: {}, {}, {}, {}", number.r, number.g, number.b, number.a);
@@ -68,7 +68,7 @@ struct formatter<halp::impulse_type>
   }
 
   template <typename FormatContext>
-  auto format(const halp::impulse_type& number, FormatContext& ctx)
+  auto format(const halp::impulse_type& number, FormatContext& ctx) const
   {
     return fmt::format_to(ctx.out(), "impulse");
   }
@@ -84,7 +84,7 @@ struct formatter<halp::range_slider_value<T>>
   }
 
   template <typename FormatContext>
-  auto format(const halp::range_slider_value<T>& number, FormatContext& ctx)
+  auto format(const halp::range_slider_value<T>& number, FormatContext& ctx) const
   {
     return fmt::format_to(ctx.out(), "range: {} -> {}", number.start, number.end);
   }