update github actions

Author: newdigate

CMakeLists.txt

@@ -1,25 +1,30 @@
 cmake_minimum_required(VERSION 3.5)
 project(teensy-variable-playback)
+include(cmake_declare_and_fetch.cmake.in)
+
 if (NOT DEFINED TEENSY_VERSION)
     set(BUILD_FOR_LINUX 1)
     add_definitions(-DBUILD_FOR_LINUX)
 endif()
 
-if (NOT DEFINED BUILD_FOR_LINUX)    
-    import_arduino_library(cores ${COREPATH} avr debug util)
-    import_arduino_library(SPI ${DEPSPATH}/SPI)
-    import_arduino_library(SdFat ${DEPSPATH}/SdFat/src common DigitalIO ExFatLib FatLib FsLib iostream SdCard SpiDriver)
-    import_arduino_library(SD ${DEPSPATH}/SD/src)
-    import_arduino_library(SerialFlash ${DEPSPATH}/SerialFlash util)
-    import_arduino_library(Wire ${DEPSPATH}/Wire utility)
-    import_arduino_library(arm_math ${DEPSPATH}/arm_math/src)
-    import_arduino_library(Audio ${DEPSPATH}/Audio utility)
-    import_arduino_library(LittleFS ${DEPSPATH}/LittleFS/src littlefs)
+if (NOT DEFINED BUILD_FOR_LINUX)
+    DeclareAndFetchNoSource(teensy_cmake_macros            https://github.com/newdigate/teensy-cmake-macros.git main)
+    include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
+    import_arduino_library(cores ${teensy_cores_SOURCE_DIR}/teensy4 avr debug util)
+
+    import_arduino_library_git(SPI https://github.com/PaulStoffregen/SPI.git master "")
+    import_arduino_library_git(SdFat https://github.com/PaulStoffregen/SdFat.git master "src" common DigitalIO ExFatLib FatLib FsLib iostream SdCard SpiDriver)
+    import_arduino_library_git(SD https://github.com/PaulStoffregen/SD.git Juse_Use_SdFat src)
+    import_arduino_library_git(SerialFlash https://github.com/PaulStoffregen/SerialFlash.git master "")
+    import_arduino_library_git(Wire https://github.com/PaulStoffregen/Wire.git master "" utility)
+    import_arduino_library_git(arm_math https://github.com/PaulStoffregen/arm_math.git master "src")
+    import_arduino_library_git(Audio https://github.com/PaulStoffregen/Audio.git master "" "utility")
+    import_arduino_library_git(LittleFS https://github.com/PaulStoffregen/LittleFS.git main "src" "littlefs")
     add_subdirectory(src)
     add_subdirectory(examples)
 else()
 
-    include(cmake_declare_and_fetch.cmake.in)
+
     DeclareAndFetch(teensy_x86_stubs            https://github.com/newdigate/teensy-x86-stubs.git main src)
     DeclareAndFetch(teensy_x86_sd_stubs         https://github.com/newdigate/teensy-x86-sd-stubs main src)
     DeclareAndFetch(teensy_audio_x86_stubs      https://github.com/newdigate/teensy-audio-x86-stubs main src)

cmake/toolchains/teensy41.cmake

@@ -4,8 +4,11 @@ set(CMAKE_EXE_LINKER_FLAGS "--specs=nosys.specs" CACHE INTERNAL "")
 #teensy compiler options
 set(COMPILERPATH "/opt/gcc-arm-none-eabi-9-2019-q4-major/bin/")
 #set(COMPILERPATH "/Applications/ARM/bin/")
-set(DEPSPATH "/home/runner/work/teensy-variable-playback/teensy-variable-playback/deps")
-#set(DEPSPATH "/Users/nicholasnewdigate/Development/github/newdigate/temp_dep")
-set(COREPATH "${DEPSPATH}/cores/teensy4/")
 
-find_package(teensy_cmake_macros)
+set(BUILD_FOR_TEENSY ON)
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
+set(CMAKE_C_COMPILER ${COMPILERPATH}arm-none-eabi-gcc)
+set(CMAKE_CXX_COMPILER ${COMPILERPATH}arm-none-eabi-g++)
+set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_C_COMPILER} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

extras/linux/array/CMakeLists.txt

@@ -2,20 +2,11 @@ cmake_minimum_required(VERSION 3.10)
 project(array)
 set(CMAKE_CXX_STANDARD 14)
 
-find_package(teensy_x86_stubs)
-include_directories(${teensy_x86_stubs_INCLUDE_DIR})
-
-find_package(teensy_audio_x86_stubs)
-include_directories(${teensy_audio_x86_stubs_INCLUDE_DIR})
-
-find_package(teensy_x86_sd_stubs)
-include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
-
 include_directories(../../../src)
 
 add_executable(array array.cpp)
 
-target_link_libraries(array ${teensy_x86_stubs_LIBS})
-target_link_libraries(array ${teensy_audio_x86_stubs_LIBS})
-target_link_libraries(array ${teensy_x86_sd_stubs_LIBS})
-target_link_libraries(array teensy_variable_playback)
+target_link_libraries(array teensy_x86_stubs)
+target_link_libraries(array teensy_audio_x86_stubs)
+target_link_libraries(array teensy_x86_sd_stubs)
+target_link_libraries(array teensy_variable_playback)

extras/linux/sd_raw/CMakeLists.txt

@@ -2,19 +2,10 @@ cmake_minimum_required(VERSION 3.10)
 project(sd_raw)
 set(CMAKE_CXX_STANDARD 14)
 
-find_package(teensy_x86_stubs)
-include_directories(${teensy_x86_stubs_INCLUDE_DIR})
-
-find_package(teensy_audio_x86_stubs)
-include_directories(${teensy_audio_x86_stubs_INCLUDE_DIR})
-
-find_package(teensy_x86_sd_stubs)
-include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
-
 include_directories(../../../src)
 add_executable(sd_raw sd_raw.cpp)
 
-target_link_libraries(sd_raw ${teensy_x86_stubs_LIBS})
-target_link_libraries(sd_raw ${teensy_audio_x86_stubs_LIBS})
-target_link_libraries(sd_raw ${teensy_x86_sd_stubs_LIBS})
+target_link_libraries(sd_raw teensy_x86_stubs)
+target_link_libraries(sd_raw teensy_audio_x86_stubs)
+target_link_libraries(sd_raw teensy_x86_sd_stubs)
 target_link_libraries(sd_raw teensy_variable_playback)