Compile as esp-idf component

Author: johnboiles

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "freetype"]
-	path = freetype
+	path = freetype/freetype
 	url = https://github.com/sindarin-inc/freetype.git

CMakeLists.txt

@@ -0,0 +1,29 @@
+file(GLOB_RECURSE SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/IBMFDriver/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/TTFDriver/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Misc/*.cpp
+)
+
+if(DEFINED ESP_PLATFORM AND ESP_PLATFORM)
+    set(compile_options
+        -includesdkconfig.h
+    )
+
+    idf_component_register(SRCS ${SOURCES}
+                        INCLUDE_DIRS "src"
+                        REQUIRES freetype)
+
+    target_compile_options(${COMPONENT_TARGET} PUBLIC ${compile_options})
+else()
+    add_library(tiny-font STATIC
+        ${SOURCES}
+    )
+    target_include_directories(tiny-font PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+    )
+endif()
+
+
+
+project(tiny-font)

Kconfig

@@ -0,0 +1,28 @@
+menu "Tiny Font Options"
+
+    choice
+
+        prompt "Font System"
+        default FONT_IBMF
+
+        config FONT_IBMF
+            bool "IBMF 1bpp Sol Sans Font"
+
+        config FONT_TTF
+            bool "TTF Font via FreeType"
+
+    endchoice
+
+    config DISPLAY_PIXEL_RESOLUTION_IS_FIX
+        bool "Display pixel resolution is unchangeable at runtime."
+        default y
+
+    config TTF_SCREEN_RES_PER_INCH
+        int "Screen resolution per inch (for TTF sizing)"
+        default 150
+
+    config USE_SPIRAM
+        bool "Use SPIRAM heap when possible"
+        default y
+
+endmenu

examples/SDL/TTF/CMakeLists.txt

@@ -26,7 +26,7 @@ target_include_directories(ttf_sdl PRIVATE
 set(FT_DISABLE_PNG ON CACHE BOOL "Disable PNG support in FreeType" FORCE)
 set(FT_DISABLE_HARFBUZZ ON CACHE BOOL "Disable HarfBuzz support in FreeType" FORCE)
 set(FT_DISABLE_BROTLI ON CACHE BOOL "Disable Brotli support in FreeType" FORCE)
-add_subdirectory(${TINY_FONT_ROOT}/freetype ${CMAKE_CURRENT_BINARY_DIR}/freetype)
+add_subdirectory(${TINY_FONT_ROOT}/freetype/freetype ${CMAKE_CURRENT_BINARY_DIR}/freetype)
 
 target_link_libraries(ttf_sdl PRIVATE SDL2::SDL2 freetype)
 

freetype/CMakeLists.txt

@@ -0,0 +1,20 @@
+idf_component_register()
+
+# Override options defined in freetype/CMakeLists.txt.
+# We could have used normal set(...) here if freetype enabled CMake policy CMP0077.
+option(FT_DISABLE_HARFBUZZ "" ON)
+option(FT_DISABLE_BZIP2 "" ON)
+option(FT_DISABLE_BROTLI "" ON)
+option(FT_DISABLE_PNG "" ON)
+option(FT_DISABLE_ZLIB "" ON)
+
+# These are regular CMake variables, so we can set them directly.
+set(SKIP_INSTALL_ALL TRUE)
+set(BUILD_SHARED_LIBS OFF)
+
+add_subdirectory(freetype output)
+
+# https://gitlab.freedesktop.org/freetype/freetype/-/issues/1299
+target_compile_options(freetype PRIVATE "-Wno-dangling-pointer")
+
+target_link_libraries(${COMPONENT_LIB} INTERFACE freetype)

freetype freetype/freetypefreetype renamed to freetype/freetype

@@ -0,0 +1,4 @@
+## IDF Component Manager Manifest File
+dependencies:
+  freetype:
+    path: ./freetype

idf_component.yml

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <inttypes.h>
 #include <cstdio>
+#include <inttypes.h>
 
 // These are the definitions that are common to both IBMF and TTF Font types
 

src/FontDefs.hpp

@@ -41,5 +41,3 @@ extern Font fontFace1;
 extern Font fontFace2;
 
 #endif
-
-auto FontFromPrefs(int choice) -> Font *;

src/Fonts.hpp

@@ -7,13 +7,13 @@
 #include <esp_heap_caps.h>
 
 template <typename T>
-struct SpiramAllocator {
+struct FontSpiramAllocator {
     using value_type = T;
 
-    SpiramAllocator() = default;
+    FontSpiramAllocator() = default;
 
     template <typename U>
-    SpiramAllocator(const SpiramAllocator<U> &) {}
+    FontSpiramAllocator(const FontSpiramAllocator<U> &) {}
 
     auto allocate(std::size_t n) -> T * {
         // Using a pointer type as T will otherwise raises a warning since a common bug is to use a
@@ -34,8 +34,4 @@ struct SpiramAllocator {
     void deallocate(T *p, std::size_t n) { heap_caps_free(reinterpret_cast<void *>(p)); }
 };
 
-template <typename K, typename V>
-using SpiramMap = std::unordered_map<K, V, std::hash<K>, std::equal_to<K>,
-                                     SpiramAllocator<std::pair<const K, V>>>;
-
 #endif