Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
Expand All @@ -33,6 +33,11 @@ jobs:
with:
key: ${{ github.job }}-${{ matrix.os }}
variant: sccache
- name: Install SDL X11 dependencies (Linux)
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxfixes-dev libxss-dev libxtst-dev libxkbcommon-dev
- uses: lukka/run-cmake@5d55ea7949e25f69f0ecb516d8d572297e03a956 # v10.9
with:
configurePreset: "continuous-integration"
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
with:
key: ${{ github.job }}
max-size: 2G
- name: Install SDL X11 dependencies
run: |
apt-get update
apt-get install -y --no-install-recommends libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxfixes-dev libxss-dev libxtst-dev libxkbcommon-dev
- name: Build & Collect Coverage
run: |
cmake --preset coverage -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
Expand Down Expand Up @@ -70,6 +74,10 @@ jobs:
- uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
with:
languages: cpp
- name: Install SDL X11 dependencies
run: |
apt-get update
apt-get install -y --no-install-recommends libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxfixes-dev libxss-dev libxtst-dev libxkbcommon-dev
- uses: lukka/run-cmake@5d55ea7949e25f69f0ecb516d8d572297e03a956 # v10.9
with:
configurePreset: "continuous-integration"
Expand Down
2 changes: 1 addition & 1 deletion preview/sdl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if (EMIL_BUILD_WIN AND PREVIEW_INCLUDE_SDL)
if (EMIL_HOST_BUILD AND PREVIEW_INCLUDE_SDL)
include(FetchContent)

FetchContent_Declare(
Expand Down
4 changes: 2 additions & 2 deletions preview/sdl/DirectDisplaySdl.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "preview/sdl/DirectDisplaySdl.hpp"
#include "preview/interfaces/Colour.hpp"
#include "SDL3/SDL.h"
#include "preview/interfaces/Colour.hpp"

Expand All @@ -8,7 +7,8 @@ namespace
SDL_FRect Convert(infra::Region region)
{
SDL_FRect result;
SDL_RectToFRect(&SDL_Rect{ region.TopLeft().x, region.TopLeft().y, region.Width(), region.Height() }, &result);
SDL_Rect rect{ region.TopLeft().x, region.TopLeft().y, region.Width(), region.Height() };
SDL_RectToFRect(&rect, &result);
return result;
}
}
Expand Down
Loading