Update for boilerplate/sdk changes

Daft-Freak · Feb 10, 2021 · a32e8a8 · a32e8a8
1 parent d9772d3
commit a32e8a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,25 +25,25 @@ jobs:
           - os: ubuntu-20.04
             name: Linux
             #release-suffix: LIN64
-            cmake-args: -D32BLIT_PATH=$GITHUB_WORKSPACE/32blit
+            cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE/32blit-sdk
             apt-packages: libsdl2-dev libsdl2-image-dev libsdl2-net-dev python3-setuptools
 
           - os: ubuntu-20.04
             name: STM32
             release-suffix: STM32
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/32blit/32blit.toolchain
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/32blit-sdk/32blit.toolchain
             apt-packages: gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib python3-setuptools
 
           - os: macos-latest
             name: macOS
             #release-suffix: MACOS
-            cmake-args: -D32BLIT_PATH=$GITHUB_WORKSPACE/32blit
+            cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE/32blit-sdk
             brew-packages: sdl2 sdl2_image sdl2_net
 
           - os: windows-latest
             name: Visual Studio
             #release-suffix: WIN64
-            cmake-args: -D32BLIT_PATH=$GITHUB_WORKSPACE/32blit
+            cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE/32blit-sdk
 
     runs-on: ${{matrix.os}}
 
@@ -62,8 +62,8 @@ jobs:
     - name: Checkout 32Blit API
       uses: actions/checkout@v2
       with:
-        repository: pimoroni/32blit-beta
-        path: 32blit
+        repository: 32blit/32blit-sdk
+        path: 32blit-sdk
 
     # Linux dependencies
     - name: Install Linux deps

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.9)
 
 project(music-player)
-set(32BLIT_PATH "../" CACHE PATH "Path to 32blit.cmake")
+
 set(PROJECT_SOURCE
     mp3-stream.cpp
     music-player.cpp
@@ -16,14 +16,12 @@ set(PROJECT_DISTRIBS LICENSE README.md)
 
 # Build configuration; approach this with caution!
 if(MSVC)
-  add_compile_options("/W4" "/wd4244" "/wd4324")
+  add_compile_options("/W4" "/wd4244" "/wd4324" "/wd4458" "/wd4100")
 else()
-  add_compile_options("-Wall" "-Wextra" "-Wdouble-promotion")
-endif()
-if(NOT EXISTS ${32BLIT_PATH}/32blit.cmake)
-  message(FATAL_ERROR "Define location of 32Blit API with -D32BLIT_PATH=<path to 32blit.cmake>")
+  add_compile_options("-Wall" "-Wextra" "-Wdouble-promotion" "-Wno-unused-parameter")
 endif()
-include (${32BLIT_PATH}/32blit.cmake)
+
+find_package (32BLIT CONFIG REQUIRED PATHS ../32blit-sdk)
 add_subdirectory(DUH)
 
 blit_executable (${PROJECT_NAME} ${PROJECT_SOURCE})