Merge pull request #849 from Daft-Freak/split-examples-2

Split examples v2

.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
@@ -65,7 +71,7 @@ jobs:
     - name: Prepare Site
       run: |
         mkdir -p site/examples
-        cp ../build/examples/*/*.{js,wasm} site/examples
+        cp ../build/*/*.{js,wasm} site/examples
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v3

.github/workflows/Visual Studio.yml

@@ -12,6 +12,12 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - name: Checkout Examples
+      uses: actions/checkout@v3
+      with:
+        repository: 32blit/32blit-examples
+        path: examples
+
     - name: Install deps
       shell: bash
       run: |

.github/workflows/cmake.yml

@@ -37,7 +37,7 @@ jobs:
             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
+            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
@@ -76,6 +76,12 @@ jobs:
     - name: Checkout 32Blit SDK
       uses: actions/checkout@v3
 
+    - name: Checkout Examples
+      uses: actions/checkout@v3
+      with:
+        repository: 32blit/32blit-examples
+        path: examples
+
     # pico sdk/extras for some builds
     - name: Checkout Pico SDK
       if: matrix.pico-sdk
@@ -138,7 +144,8 @@ 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
 
     - name: Set Tag Variable
       if: github.event_name == 'release'
@@ -166,19 +173,11 @@ 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: 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
 
     - 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)
 
@@ -26,6 +26,11 @@ if(NOT 32BLIT_PICO)
     add_subdirectory(launcher)
 endif()
 
+# if the examples are there, build them too
+if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/examples/CMakeLists.txt)
+    add_subdirectory(examples)
+endif()
+
 # include dist files in install
 install(DIRECTORY
     ${CMAKE_CURRENT_LIST_DIR}/dist/

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.
+The [32blit-examples](https://github.com/32blit/32blit-examples) repository 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.
 
 Refer to the OS/platform specific documentation files in the `docs/` folder for instructions on how to compile and run these examples.