From df0eba392c749d81d562e743d0ebca83ffcbd09e Mon Sep 17 00:00:00 2001 From: Mathew Winters Date: Sun, 2 Feb 2025 20:00:43 +1300 Subject: [PATCH] Update cmakelists.txt to Pico c/cpp FetchPath libraries. --- cmake/CMakeLists.txt | 3 ++- {Fonts => src/Fonts}/FreeMono12pt7b.h | 0 {Fonts => src/Fonts}/FreeMono18pt7b.h | 0 {Fonts => src/Fonts}/FreeMono24pt7b.h | 0 {Fonts => src/Fonts}/FreeMono9pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBold12pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBold18pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBold24pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBold9pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBoldOblique12pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBoldOblique18pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBoldOblique24pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoBoldOblique9pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoOblique12pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoOblique18pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoOblique24pt7b.h | 0 {Fonts => src/Fonts}/FreeMonoOblique9pt7b.h | 0 {Fonts => src/Fonts}/FreeSans12pt7b.h | 0 {Fonts => src/Fonts}/FreeSans18pt7b.h | 0 {Fonts => src/Fonts}/FreeSans24pt7b.h | 0 {Fonts => src/Fonts}/FreeSans9pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBold12pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBold18pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBold24pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBold9pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBoldOblique12pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBoldOblique18pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBoldOblique24pt7b.h | 0 {Fonts => src/Fonts}/FreeSansBoldOblique9pt7b.h | 0 {Fonts => src/Fonts}/FreeSansOblique12pt7b.h | 0 {Fonts => src/Fonts}/FreeSansOblique18pt7b.h | 0 {Fonts => src/Fonts}/FreeSansOblique24pt7b.h | 0 {Fonts => src/Fonts}/FreeSansOblique9pt7b.h | 0 {Fonts => src/Fonts}/FreeSerif12pt7b.h | 0 {Fonts => src/Fonts}/FreeSerif18pt7b.h | 0 {Fonts => src/Fonts}/FreeSerif24pt7b.h | 0 {Fonts => src/Fonts}/FreeSerif9pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBold12pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBold18pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBold24pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBold9pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBoldItalic12pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBoldItalic18pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBoldItalic24pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifBoldItalic9pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifItalic12pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifItalic18pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifItalic24pt7b.h | 0 {Fonts => src/Fonts}/FreeSerifItalic9pt7b.h | 0 {Fonts => src/Fonts}/Org_01.h | 0 {Fonts => src/Fonts}/Picopixel.h | 0 {Fonts => src/Fonts}/Tiny3x3a2pt7b.h | 0 {Fonts => src/Fonts}/TomThumb.h | 0 53 files changed, 2 insertions(+), 1 deletion(-) rename {Fonts => src/Fonts}/FreeMono12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMono18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMono24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMono9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBold12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBold18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBold24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBold9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBoldOblique12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBoldOblique18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBoldOblique24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoBoldOblique9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoOblique12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoOblique18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoOblique24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeMonoOblique9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSans12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSans18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSans24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSans9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBold12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBold18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBold24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBold9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBoldOblique12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBoldOblique18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBoldOblique24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansBoldOblique9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansOblique12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansOblique18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansOblique24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSansOblique9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerif12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerif18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerif24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerif9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBold12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBold18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBold24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBold9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBoldItalic12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBoldItalic18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBoldItalic24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifBoldItalic9pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifItalic12pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifItalic18pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifItalic24pt7b.h (100%) rename {Fonts => src/Fonts}/FreeSerifItalic9pt7b.h (100%) rename {Fonts => src/Fonts}/Org_01.h (100%) rename {Fonts => src/Fonts}/Picopixel.h (100%) rename {Fonts => src/Fonts}/Tiny3x3a2pt7b.h (100%) rename {Fonts => src/Fonts}/TomThumb.h (100%) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 35460f16..99e907e4 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.13) add_library(AdafruitGFXNativePort ../src/Adafruit_SSD1306.cpp @@ -11,7 +12,7 @@ target_compile_definitions(AdafruitGFXNativePort ) target_include_directories(AdafruitGFXNativePort PUBLIC - ${PROJECT_SOURCE_DIR}/mbed_lib/Adafruit-GFX-mbed-fork/src + ../src ) target_link_libraries(AdafruitGFXNativePort PUBLIC pico_stdlib pico_sync IoAbstraction TaskManagerIO tcUnicodeHelper) diff --git a/Fonts/FreeMono12pt7b.h b/src/Fonts/FreeMono12pt7b.h similarity index 100% rename from Fonts/FreeMono12pt7b.h rename to src/Fonts/FreeMono12pt7b.h diff --git a/Fonts/FreeMono18pt7b.h b/src/Fonts/FreeMono18pt7b.h similarity index 100% rename from Fonts/FreeMono18pt7b.h rename to src/Fonts/FreeMono18pt7b.h diff --git a/Fonts/FreeMono24pt7b.h b/src/Fonts/FreeMono24pt7b.h similarity index 100% rename from Fonts/FreeMono24pt7b.h rename to src/Fonts/FreeMono24pt7b.h diff --git a/Fonts/FreeMono9pt7b.h b/src/Fonts/FreeMono9pt7b.h similarity index 100% rename from Fonts/FreeMono9pt7b.h rename to src/Fonts/FreeMono9pt7b.h diff --git a/Fonts/FreeMonoBold12pt7b.h b/src/Fonts/FreeMonoBold12pt7b.h similarity index 100% rename from Fonts/FreeMonoBold12pt7b.h rename to src/Fonts/FreeMonoBold12pt7b.h diff --git a/Fonts/FreeMonoBold18pt7b.h b/src/Fonts/FreeMonoBold18pt7b.h similarity index 100% rename from Fonts/FreeMonoBold18pt7b.h rename to src/Fonts/FreeMonoBold18pt7b.h diff --git a/Fonts/FreeMonoBold24pt7b.h b/src/Fonts/FreeMonoBold24pt7b.h similarity index 100% rename from Fonts/FreeMonoBold24pt7b.h rename to src/Fonts/FreeMonoBold24pt7b.h diff --git a/Fonts/FreeMonoBold9pt7b.h b/src/Fonts/FreeMonoBold9pt7b.h similarity index 100% rename from Fonts/FreeMonoBold9pt7b.h rename to src/Fonts/FreeMonoBold9pt7b.h diff --git a/Fonts/FreeMonoBoldOblique12pt7b.h b/src/Fonts/FreeMonoBoldOblique12pt7b.h similarity index 100% rename from Fonts/FreeMonoBoldOblique12pt7b.h rename to src/Fonts/FreeMonoBoldOblique12pt7b.h diff --git a/Fonts/FreeMonoBoldOblique18pt7b.h b/src/Fonts/FreeMonoBoldOblique18pt7b.h similarity index 100% rename from Fonts/FreeMonoBoldOblique18pt7b.h rename to src/Fonts/FreeMonoBoldOblique18pt7b.h diff --git a/Fonts/FreeMonoBoldOblique24pt7b.h b/src/Fonts/FreeMonoBoldOblique24pt7b.h similarity index 100% rename from Fonts/FreeMonoBoldOblique24pt7b.h rename to src/Fonts/FreeMonoBoldOblique24pt7b.h diff --git a/Fonts/FreeMonoBoldOblique9pt7b.h b/src/Fonts/FreeMonoBoldOblique9pt7b.h similarity index 100% rename from Fonts/FreeMonoBoldOblique9pt7b.h rename to src/Fonts/FreeMonoBoldOblique9pt7b.h diff --git a/Fonts/FreeMonoOblique12pt7b.h b/src/Fonts/FreeMonoOblique12pt7b.h similarity index 100% rename from Fonts/FreeMonoOblique12pt7b.h rename to src/Fonts/FreeMonoOblique12pt7b.h diff --git a/Fonts/FreeMonoOblique18pt7b.h b/src/Fonts/FreeMonoOblique18pt7b.h similarity index 100% rename from Fonts/FreeMonoOblique18pt7b.h rename to src/Fonts/FreeMonoOblique18pt7b.h diff --git a/Fonts/FreeMonoOblique24pt7b.h b/src/Fonts/FreeMonoOblique24pt7b.h similarity index 100% rename from Fonts/FreeMonoOblique24pt7b.h rename to src/Fonts/FreeMonoOblique24pt7b.h diff --git a/Fonts/FreeMonoOblique9pt7b.h b/src/Fonts/FreeMonoOblique9pt7b.h similarity index 100% rename from Fonts/FreeMonoOblique9pt7b.h rename to src/Fonts/FreeMonoOblique9pt7b.h diff --git a/Fonts/FreeSans12pt7b.h b/src/Fonts/FreeSans12pt7b.h similarity index 100% rename from Fonts/FreeSans12pt7b.h rename to src/Fonts/FreeSans12pt7b.h diff --git a/Fonts/FreeSans18pt7b.h b/src/Fonts/FreeSans18pt7b.h similarity index 100% rename from Fonts/FreeSans18pt7b.h rename to src/Fonts/FreeSans18pt7b.h diff --git a/Fonts/FreeSans24pt7b.h b/src/Fonts/FreeSans24pt7b.h similarity index 100% rename from Fonts/FreeSans24pt7b.h rename to src/Fonts/FreeSans24pt7b.h diff --git a/Fonts/FreeSans9pt7b.h b/src/Fonts/FreeSans9pt7b.h similarity index 100% rename from Fonts/FreeSans9pt7b.h rename to src/Fonts/FreeSans9pt7b.h diff --git a/Fonts/FreeSansBold12pt7b.h b/src/Fonts/FreeSansBold12pt7b.h similarity index 100% rename from Fonts/FreeSansBold12pt7b.h rename to src/Fonts/FreeSansBold12pt7b.h diff --git a/Fonts/FreeSansBold18pt7b.h b/src/Fonts/FreeSansBold18pt7b.h similarity index 100% rename from Fonts/FreeSansBold18pt7b.h rename to src/Fonts/FreeSansBold18pt7b.h diff --git a/Fonts/FreeSansBold24pt7b.h b/src/Fonts/FreeSansBold24pt7b.h similarity index 100% rename from Fonts/FreeSansBold24pt7b.h rename to src/Fonts/FreeSansBold24pt7b.h diff --git a/Fonts/FreeSansBold9pt7b.h b/src/Fonts/FreeSansBold9pt7b.h similarity index 100% rename from Fonts/FreeSansBold9pt7b.h rename to src/Fonts/FreeSansBold9pt7b.h diff --git a/Fonts/FreeSansBoldOblique12pt7b.h b/src/Fonts/FreeSansBoldOblique12pt7b.h similarity index 100% rename from Fonts/FreeSansBoldOblique12pt7b.h rename to src/Fonts/FreeSansBoldOblique12pt7b.h diff --git a/Fonts/FreeSansBoldOblique18pt7b.h b/src/Fonts/FreeSansBoldOblique18pt7b.h similarity index 100% rename from Fonts/FreeSansBoldOblique18pt7b.h rename to src/Fonts/FreeSansBoldOblique18pt7b.h diff --git a/Fonts/FreeSansBoldOblique24pt7b.h b/src/Fonts/FreeSansBoldOblique24pt7b.h similarity index 100% rename from Fonts/FreeSansBoldOblique24pt7b.h rename to src/Fonts/FreeSansBoldOblique24pt7b.h diff --git a/Fonts/FreeSansBoldOblique9pt7b.h b/src/Fonts/FreeSansBoldOblique9pt7b.h similarity index 100% rename from Fonts/FreeSansBoldOblique9pt7b.h rename to src/Fonts/FreeSansBoldOblique9pt7b.h diff --git a/Fonts/FreeSansOblique12pt7b.h b/src/Fonts/FreeSansOblique12pt7b.h similarity index 100% rename from Fonts/FreeSansOblique12pt7b.h rename to src/Fonts/FreeSansOblique12pt7b.h diff --git a/Fonts/FreeSansOblique18pt7b.h b/src/Fonts/FreeSansOblique18pt7b.h similarity index 100% rename from Fonts/FreeSansOblique18pt7b.h rename to src/Fonts/FreeSansOblique18pt7b.h diff --git a/Fonts/FreeSansOblique24pt7b.h b/src/Fonts/FreeSansOblique24pt7b.h similarity index 100% rename from Fonts/FreeSansOblique24pt7b.h rename to src/Fonts/FreeSansOblique24pt7b.h diff --git a/Fonts/FreeSansOblique9pt7b.h b/src/Fonts/FreeSansOblique9pt7b.h similarity index 100% rename from Fonts/FreeSansOblique9pt7b.h rename to src/Fonts/FreeSansOblique9pt7b.h diff --git a/Fonts/FreeSerif12pt7b.h b/src/Fonts/FreeSerif12pt7b.h similarity index 100% rename from Fonts/FreeSerif12pt7b.h rename to src/Fonts/FreeSerif12pt7b.h diff --git a/Fonts/FreeSerif18pt7b.h b/src/Fonts/FreeSerif18pt7b.h similarity index 100% rename from Fonts/FreeSerif18pt7b.h rename to src/Fonts/FreeSerif18pt7b.h diff --git a/Fonts/FreeSerif24pt7b.h b/src/Fonts/FreeSerif24pt7b.h similarity index 100% rename from Fonts/FreeSerif24pt7b.h rename to src/Fonts/FreeSerif24pt7b.h diff --git a/Fonts/FreeSerif9pt7b.h b/src/Fonts/FreeSerif9pt7b.h similarity index 100% rename from Fonts/FreeSerif9pt7b.h rename to src/Fonts/FreeSerif9pt7b.h diff --git a/Fonts/FreeSerifBold12pt7b.h b/src/Fonts/FreeSerifBold12pt7b.h similarity index 100% rename from Fonts/FreeSerifBold12pt7b.h rename to src/Fonts/FreeSerifBold12pt7b.h diff --git a/Fonts/FreeSerifBold18pt7b.h b/src/Fonts/FreeSerifBold18pt7b.h similarity index 100% rename from Fonts/FreeSerifBold18pt7b.h rename to src/Fonts/FreeSerifBold18pt7b.h diff --git a/Fonts/FreeSerifBold24pt7b.h b/src/Fonts/FreeSerifBold24pt7b.h similarity index 100% rename from Fonts/FreeSerifBold24pt7b.h rename to src/Fonts/FreeSerifBold24pt7b.h diff --git a/Fonts/FreeSerifBold9pt7b.h b/src/Fonts/FreeSerifBold9pt7b.h similarity index 100% rename from Fonts/FreeSerifBold9pt7b.h rename to src/Fonts/FreeSerifBold9pt7b.h diff --git a/Fonts/FreeSerifBoldItalic12pt7b.h b/src/Fonts/FreeSerifBoldItalic12pt7b.h similarity index 100% rename from Fonts/FreeSerifBoldItalic12pt7b.h rename to src/Fonts/FreeSerifBoldItalic12pt7b.h diff --git a/Fonts/FreeSerifBoldItalic18pt7b.h b/src/Fonts/FreeSerifBoldItalic18pt7b.h similarity index 100% rename from Fonts/FreeSerifBoldItalic18pt7b.h rename to src/Fonts/FreeSerifBoldItalic18pt7b.h diff --git a/Fonts/FreeSerifBoldItalic24pt7b.h b/src/Fonts/FreeSerifBoldItalic24pt7b.h similarity index 100% rename from Fonts/FreeSerifBoldItalic24pt7b.h rename to src/Fonts/FreeSerifBoldItalic24pt7b.h diff --git a/Fonts/FreeSerifBoldItalic9pt7b.h b/src/Fonts/FreeSerifBoldItalic9pt7b.h similarity index 100% rename from Fonts/FreeSerifBoldItalic9pt7b.h rename to src/Fonts/FreeSerifBoldItalic9pt7b.h diff --git a/Fonts/FreeSerifItalic12pt7b.h b/src/Fonts/FreeSerifItalic12pt7b.h similarity index 100% rename from Fonts/FreeSerifItalic12pt7b.h rename to src/Fonts/FreeSerifItalic12pt7b.h diff --git a/Fonts/FreeSerifItalic18pt7b.h b/src/Fonts/FreeSerifItalic18pt7b.h similarity index 100% rename from Fonts/FreeSerifItalic18pt7b.h rename to src/Fonts/FreeSerifItalic18pt7b.h diff --git a/Fonts/FreeSerifItalic24pt7b.h b/src/Fonts/FreeSerifItalic24pt7b.h similarity index 100% rename from Fonts/FreeSerifItalic24pt7b.h rename to src/Fonts/FreeSerifItalic24pt7b.h diff --git a/Fonts/FreeSerifItalic9pt7b.h b/src/Fonts/FreeSerifItalic9pt7b.h similarity index 100% rename from Fonts/FreeSerifItalic9pt7b.h rename to src/Fonts/FreeSerifItalic9pt7b.h diff --git a/Fonts/Org_01.h b/src/Fonts/Org_01.h similarity index 100% rename from Fonts/Org_01.h rename to src/Fonts/Org_01.h diff --git a/Fonts/Picopixel.h b/src/Fonts/Picopixel.h similarity index 100% rename from Fonts/Picopixel.h rename to src/Fonts/Picopixel.h diff --git a/Fonts/Tiny3x3a2pt7b.h b/src/Fonts/Tiny3x3a2pt7b.h similarity index 100% rename from Fonts/Tiny3x3a2pt7b.h rename to src/Fonts/Tiny3x3a2pt7b.h diff --git a/Fonts/TomThumb.h b/src/Fonts/TomThumb.h similarity index 100% rename from Fonts/TomThumb.h rename to src/Fonts/TomThumb.h