Type Cleanup & Rendering Fixes

cmake/pico.cmake

@@ -37,6 +37,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 pico_sdk_init()
 
+set(VAMP_MODULUS_INCLUDE_DIR "" CACHE PATH "Path to the Modulus public include directory")
+if(NOT VAMP_MODULUS_INCLUDE_DIR)
+  set(VAMP_MODULUS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../modulus/include")
+endif()
+get_filename_component(VAMP_MODULUS_INCLUDE_DIR "${VAMP_MODULUS_INCLUDE_DIR}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+if(NOT EXISTS "${VAMP_MODULUS_INCLUDE_DIR}/modulus/types.hpp")
+  message(FATAL_ERROR "VAMP_MODULUS_INCLUDE_DIR must contain modulus/types.hpp: ${VAMP_MODULUS_INCLUDE_DIR}")
+endif()
+
 add_executable(product-vamp-pico2w
   src/vamp_style.cpp
   src/vamp_style/font.cpp
@@ -48,6 +57,7 @@ add_executable(product-vamp-pico2w
 )
 target_include_directories(product-vamp-pico2w PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${VAMP_MODULUS_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/include/vamp_pico/capi
 )
 target_compile_definitions(product-vamp-pico2w PRIVATE

cmake/zero.cmake

@@ -33,6 +33,9 @@ target_include_directories(vamp-style PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 target_compile_features(vamp-style PUBLIC cxx_std_17)
+target_link_libraries(vamp-style PUBLIC
+  modulus::modulus
+)
 
 set(VAMP_PROTOCOL_SOURCES
   src/vamp_protocol/page_control.cpp
@@ -43,6 +46,9 @@ target_include_directories(vamp-protocol PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 target_compile_features(vamp-protocol PUBLIC cxx_std_17)
+target_link_libraries(vamp-protocol PUBLIC
+  modulus::modulus
+)
 
 set(VAMP_CORE_SOURCES
   src/vamp_zero/app.cpp
@@ -205,6 +211,7 @@ if(VAMP_BUILD_PICO_FIRMWARE)
       "${VAMP_PICO_WIFI_PASSPHRASE}"
       "${VAMP_ZERO_HOST}"
       "${VAMP_ZERO_PORT}"
+      "${modulus_INCLUDE_DIR}"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS
       package/scripts/build_pico_firmware.sh