Split examples

.github/workflows/Emscripten.yml

@@ -21,6 +21,12 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - name: Checkout Examples
+      uses: actions/checkout@v3
+      with:
+        repository: 32blit/32blit-examples
+        path: 32blit-examples
+
     - name: Install deps
       run: |
         sudo apt update && sudo apt install doxygen graphviz python3-setuptools
@@ -50,7 +56,7 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
-      run: emcmake cmake $GITHUB_WORKSPACE -D32BLIT_DIR=$GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG"
+      run: emcmake cmake $GITHUB_WORKSPACE/32blit-examples -D32BLIT_DIR=$GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG"
 
     # Problem matching
     - uses: ammaraskar/gcc-problem-matcher@master

.github/workflows/cmake.yml

@@ -21,7 +21,7 @@ jobs:
           - os: ubuntu-20.04
             name: Linux
             cache-key: linux
-            release-suffix: LIN64
+            artifact-suffix: LIN64
             cmake-args: '"-DCMAKE_CXX_CLANG_TIDY=clang-tidy;-header-filter=(32blit|32blit-sdl)/;-checks=performance-*,portability-*,modernize-*,-modernize-use-trailing-return-type,-modernize-avoid-c-arrays,-modernize-use-nodiscard" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache'
             apt-packages: ccache clang-tidy libsdl2-dev libsdl2-image-dev libsdl2-net-dev python3-setuptools
 
@@ -36,8 +36,8 @@ jobs:
             pico-sdk: true
             name: PicoSystem
             cache-key: picosystem
-            release-suffix: PicoSystem
-            cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE -DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk -DPICO_BOARD=pimoroni_picosystem -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+            artifact-suffix: PicoSystem
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/pico.toolchain -DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk -DPICO_BOARD=pimoroni_picosystem -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
             apt-packages: ccache gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib python3-setuptools
 
           - os: ubuntu-20.04
@@ -56,7 +56,7 @@ jobs:
           - os: windows-latest
             name: Visual Studio
             cache-key: windows
-            release-suffix: WIN64
+            artifact-suffix: WIN64
             cmake-args: -DSDL2_DIR=$GITHUB_WORKSPACE/vs/sdl
 
     runs-on: ${{matrix.os}}
@@ -68,6 +68,12 @@ jobs:
     - name: Checkout 32Blit SDK
       uses: actions/checkout@v3
 
+    - name: Checkout Examples
+      uses: actions/checkout@v3
+      with:
+        repository: 32blit/32blit-examples
+        path: 32blit-examples
+
     # pico sdk/extras for some builds
     - name: Checkout Pico SDK
       if: matrix.pico-sdk
@@ -121,7 +127,9 @@ jobs:
       run: ci/install_sdl_mingw.sh
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build
+      run: |
+        cmake -E make_directory ${{runner.workspace}}/build
+        cmake -E make_directory ${{runner.workspace}}/build-examples
 
     - name: Set Tag Variable
       if: github.event_name == 'release'
@@ -149,19 +157,25 @@ jobs:
         cmake --build . --config $BUILD_TYPE -j 2
         ccache --show-stats || true
 
-    #- name: Test
-    #  working-directory: ${{runner.workspace}}/build
-    #  shell: bash
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-    #  run: ctest -C $BUILD_TYPE
+    - name: Configure Examples
+      shell: bash
+      working-directory: ${{runner.workspace}}/build-examples
+      # installs into same dir as SDK
+      run: cmake $GITHUB_WORKSPACE/32blit-examples -D32BLIT_DIR=$GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$RUNNER_WORKSPACE/build/install -DCPACK_PACKAGE_FILE_NAME=${{env.RELEASE_FILE}} ${{matrix.cmake-args}}
+
+    - name: Build Examples
+      working-directory: ${{runner.workspace}}/build-examples
+      shell: bash
+      run: |
+        cmake --build . --config $BUILD_TYPE -j 2
+        ccache --show-stats || true
 
     - name: Prepare Artifact
       if: github.event_name != 'release'
-      working-directory: ${{runner.workspace}}/build
       shell: bash
       run: |
-        cmake --build . --config $BUILD_TYPE --target install
+        cmake --build $RUNNER_WORKSPACE/build --config $BUILD_TYPE --target install
+        cmake --build $RUNNER_WORKSPACE/build-examples --config $BUILD_TYPE --target install
 
     - name: Upload Artifact
       if: github.event_name != 'release'

CMakeLists.txt

@@ -12,7 +12,7 @@ else()
 endif()
 
 find_package (32BLIT CONFIG REQUIRED PATHS .)
-add_subdirectory(examples)
+add_subdirectory(utilities)
 
 add_subdirectory(launcher-shared)
 

README.md

@@ -42,7 +42,7 @@ The `32blit-stm32` directory contains the STM32 HAL for 32blit, compatible with
 
 ## Examples / Projects
 
-The `examples` directory contains example projects, these can be built into both SDL or STM32 binaries and cover a range of techniques from simple concepts to complete games.
+Examples can be found at https://github.com/32blit/32blit-examples/, these can be built into both SDL or STM32 binaries and cover a range of techniques from simple concepts to complete games.
 
 Refer to the OS/platform specific documentation files in the `docs/` folder for instructions on how to compile and run these examples.