[wip] Try SDL-based UI for vst

cmake/avendish.cmake

@@ -13,12 +13,17 @@ endif()
 find_package(Boost QUIET REQUIRED)
 find_package(Threads QUIET)
 find_package(fmt QUIET)
+find_package(GLEW QUIET)
+find_package(glfw3 QUIET)
+find_package(OpenGL QUIET)
+find_package(SDL2 QUIET)
 add_definitions(-DFMT_HEADER_ONLY=1)
 
 include(avendish.disableexceptions)
 include(avendish.sources)
 
 include(avendish.ui.qt)
+include(avendish.ui.nuklear)
 include(avendish.max)
 include(avendish.pd)
 include(avendish.python)

cmake/avendish.sources.cmake

@@ -131,6 +131,7 @@ function(avnd_target_setup AVND_FX_TARGET)
           -fno-plt
           -ffunction-sections
           -fdata-sections
+          -ftemplate-backtrace-limit=0
     )
 
     if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL 13.0)

cmake/avendish.standalone.cmake

@@ -1,7 +1,4 @@
 find_package(ossia QUIET)
-find_package(GLEW QUIET)
-find_package(glfw3 QUIET)
-find_package(OpenGL QUIET)
 if(NOT TARGET Qt5::Quick)
   if(NOT ((TARGET GLEW::GLEW) AND (TARGET glfw) AND (TARGET OpenGL::GL)))
     function(avnd_make_standalone)
@@ -73,6 +70,7 @@ function(avnd_make_standalone)
     ${AVND_FX_TARGET}
     PUBLIC
       Avendish::Avendish
+      nuklear_impl
   )
 
   if(TARGET ossia::ossia)
@@ -92,16 +90,6 @@ function(avnd_make_standalone)
     )
   endif()
 
-  if(TARGET GLEW::GLEW)
-    target_link_libraries(
-      ${AVND_FX_TARGET}
-      PUBLIC
-        GLEW::GLEW
-        glfw
-        OpenGL::GL
-    )
-  endif()
-
   avnd_common_setup("${AVND_TARGET}" "${AVND_FX_TARGET}")
 
   target_sources(Avendish PRIVATE
@@ -155,9 +143,7 @@ function(avnd_make_standalone)
   target_link_libraries(
     ${AVND_FX_TARGET}
     PUBLIC
-      GLEW::GLEW
-      glfw
-      OpenGL::GL
+      nuklear_impl
   )
 
   avnd_common_setup("${AVND_TARGET}" "${AVND_FX_TARGET}")
@@ -170,6 +156,7 @@ function(avnd_make_standalone)
     "${AVND_SOURCE_DIR}/include/avnd/binding/ui/nuklear_layout_ui.hpp"
     "${AVND_SOURCE_DIR}/include/avnd/binding/ui/nuklear/nuklear.hpp"
     "${AVND_SOURCE_DIR}/include/avnd/binding/ui/nuklear/nuklear_glfw_gl4.h"
+    "${AVND_SOURCE_DIR}/include/avnd/binding/ui/nuklear/nuklear_xlib.h"
   )
 endfunction()
 endif()

cmake/avendish.ui.nuklear.cmake

@@ -0,0 +1,23 @@
+add_library(nuklear_impl STATIC
+  src/nuklear.cpp
+)
+target_include_directories(nuklear_impl
+  PRIVATE
+    include)
+avnd_target_setup(nuklear_impl)
+
+if(TARGET GLEW::GLEW)
+  target_link_libraries(
+    nuklear_impl
+    PUBLIC
+      GLEW::GLEW
+      glfw
+      OpenGL::GL
+  )
+endif()
+
+target_link_libraries(
+  nuklear_impl
+  PUBLIC
+    X11
+)

cmake/avendish.vintage.cmake

@@ -51,6 +51,8 @@ function(avnd_make_vintage)
     PRIVATE
       Avendish::Avendish_vintage
       DisableExceptions
+      SDL2::SDL2
+      nuklear_impl
   )
 
   avnd_common_setup("${AVND_TARGET}" "${AVND_FX_TARGET}")

examples/Raw/Addition.hpp

@@ -12,22 +12,13 @@ struct Addition
 
   struct
   {
-    struct
-    {
-      float value;
-    } a;
-    struct
-    {
-      float value;
-    } b;
+    struct { float value; } a;
+    struct { float value; } b;
   } inputs;
 
   struct
   {
-    struct
-    {
-      float value;
-    } out;
+    struct { float value; } out;
   } outputs;
 
   void operator()() { outputs.out.value = inputs.a.value + inputs.b.value; }

include/avnd/binding/ui/nuklear/nuklear.hpp

@@ -20,12 +20,12 @@
 #define NK_INCLUDE_VERTEX_BUFFER_OUTPUT
 #define NK_INCLUDE_FONT_BAKING
 #define NK_INCLUDE_DEFAULT_FONT
-#define NK_IMPLEMENTATION
-#define NK_GLFW_GL4_IMPLEMENTATION
 #define NK_KEYSTATE_BASED_INPUT
 #include <nuklear.h>
 
-#include "nuklear_glfw_gl4.h"
+// #include "nuklear_glfw_gl4.h"
+
+#include "nuklear_xlib.h"
 
 
 #define WINDOW_WIDTH 1200