From 10f7f1353cca85c3e01f8872c33b1916f6440372 Mon Sep 17 00:00:00 2001 From: ThePythonator <49040244+ThePythonator@users.noreply.github.com> Date: Thu, 19 Aug 2021 18:06:26 +0100 Subject: [PATCH 1/2] Small change to allow pico builds. --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index eebfac0..bbaf472 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,13 @@ # Basic parameters; check that these match your project / environment cmake_minimum_required(VERSION 3.9) +# Temporary check to stop it breaking if building normally with master branch of sdk +if(EXISTS ${32BLIT_DIR}/32blit-pico/sdk_import.cmake) + # If it's a pico build, include the necessary cmake files. + # This has to be called before project(game) + include(${32BLIT_DIR}/32blit-pico/sdk_import.cmake) +endif() + # Replace "game" with a name for your project (this is used the name of the output) project(game) From b555e8d3aa68147da8a3dc25aa235fd5118966c0 Mon Sep 17 00:00:00 2001 From: ThePythonator <49040244+ThePythonator@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:22:25 +0100 Subject: [PATCH 2/2] Updated to use OPTIONAL keyword. --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbaf472..30ad8e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,9 @@ # Basic parameters; check that these match your project / environment cmake_minimum_required(VERSION 3.9) -# Temporary check to stop it breaking if building normally with master branch of sdk -if(EXISTS ${32BLIT_DIR}/32blit-pico/sdk_import.cmake) - # If it's a pico build, include the necessary cmake files. - # This has to be called before project(game) - include(${32BLIT_DIR}/32blit-pico/sdk_import.cmake) -endif() +# If it's a pico build, include the necessary cmake files. +# This has to be called before project(game) +include(${32BLIT_DIR}/32blit-pico/sdk_import.cmake OPTIONAL) # Replace "game" with a name for your project (this is used the name of the output) project(game)