Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync to boilerplate #1

Merged
merged 1 commit into from
Feb 11, 2021
Merged

Sync to boilerplate #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand All @@ -61,8 +61,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
Expand Down
10 changes: 3 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
cmake_minimum_required(VERSION 3.8)

project(sprite-editor)
set(32BLIT_PATH "../" CACHE PATH "Path to 32blit.cmake")
set(PROJECT_SOURCE
main.cpp
src/mouse.cpp
Expand All @@ -17,14 +16,11 @@ 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")
add_compile_options("-Wall" "-Wextra" "-Wdouble-promotion" "-Wno-unused-parameter")
endif()
if(NOT EXISTS ${32BLIT_PATH}/32blit.cmake)
message(FATAL_ERROR "Define location of 32Blit API with -D32BLIT_PATH=<path to 32blit.cmake>")
endif()
include (${32BLIT_PATH}/32blit.cmake)
find_package (32BLIT CONFIG REQUIRED PATHS ../32blit-sdk)

blit_executable (${PROJECT_NAME} ${PROJECT_SOURCE})
blit_assets_yaml (${PROJECT_NAME} assets.yml)
Expand Down