Merge pull request #854 from Daft-Freak/pico-sdk-2.0

pico-sdk 2.0 fixes
32blit · Aug 12, 2024 · 574545f · 574545f
2 parents 478ff1c + efef9de
commit 574545f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/32blit-pico/CMakeLists.txt b/32blit-pico/CMakeLists.txt
@@ -13,7 +13,7 @@ set(PICO_SDK_VERSION_MINOR ${PICO_SDK_VERSION_MINOR} PARENT_SCOPE)
 set(PICO_SDK_VERSION_REVISION ${PICO_SDK_VERSION_REVISION} PARENT_SCOPE)
 
 # make sure BlitEngine is built with the right exception flags
-target_link_libraries(BlitEngine PUBLIC pico_cxx_options)
+target_link_libraries(BlitEngine PUBLIC pico_cxx_options pico_base_headers)
 
 # also enable function/data sectons
 target_compile_options(BlitEngine PRIVATE -ffunction-sections -fdata-sections)

diff --git a/32blit-pico/main.cpp b/32blit-pico/main.cpp
@@ -1,5 +1,6 @@
 #include <cstdio>
 
+#include "hardware/clocks.h"
 #include "hardware/structs/rosc.h"
 #include "hardware/vreg.h"
 #include "hardware/timer.h"

diff --git a/32blit/engine/fast_code.hpp b/32blit/engine/fast_code.hpp
@@ -4,7 +4,7 @@
 #define blit_fast_code(fn) __attribute__((section(".itcm." #fn))) fn
 #define blit_no_inline_fast_code(fn) __attribute__((noinline)) blit_fast_code(fn)
 #elif defined(PICO_BUILD)
-#include <pico/platform.h>
+#include <pico.h>
 
 #define blit_fast_code(fn) __not_in_flash_func(fn)
 #define blit_no_inline_fast_code(fn) __no_inline_not_in_flash_func(fn)