From e4354787aad332cd8d7bba12f62b25f41a8da46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sat, 20 Dec 2025 10:30:21 -0300 Subject: [PATCH] Build fix for macOS and FreeBSD. Update SOIL2. Use Ubuntu 24.04 on the Linux build (untested). --- .github/workflows/eepp-linux-build-check.yml | 12 ++---------- .../eterm/include/eterm/terminal/pseudoterminal.hpp | 1 + src/thirdparty/SOIL2 | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/eepp-linux-build-check.yml b/.github/workflows/eepp-linux-build-check.yml index f135c7895..4c1ba2703 100644 --- a/.github/workflows/eepp-linux-build-check.yml +++ b/.github/workflows/eepp-linux-build-check.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: Linux: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout repository uses: actions/checkout@v3 @@ -19,15 +19,7 @@ jobs: sudo add-apt-repository -y universe sudo add-apt-repository -y multiverse sudo apt update - sudo apt install -y gcc-12 g++-12 wget libsdl2-2.0-0 libsdl2-dev mesa-utils xvfb - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 10 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 10 - sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30 - sudo update-alternatives --set cc /usr/bin/gcc - sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 - sudo update-alternatives --set c++ /usr/bin/g++ - sudo update-alternatives --config gcc - sudo update-alternatives --config g++ + sudo apt install -y gcc-13 g++-13 wget libsdl2-2.0-0 libsdl2-dev mesa-utils xvfb wget https://cdn.ensoft.dev/eepp-assets/premake-5.0.0-beta6-linux.tar.gz tar xvzf premake-5.0.0-beta6-linux.tar.gz - name: Build diff --git a/src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp b/src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp index a1be5478c..88785b77a 100644 --- a/src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp +++ b/src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp @@ -25,6 +25,7 @@ #include #include #include +#include using namespace EE::Math; using namespace eterm::System; diff --git a/src/thirdparty/SOIL2 b/src/thirdparty/SOIL2 index 72fba98b2..572b7013d 160000 --- a/src/thirdparty/SOIL2 +++ b/src/thirdparty/SOIL2 @@ -1 +1 @@ -Subproject commit 72fba98b247c0319a462e9f7acd846de6692b3b0 +Subproject commit 572b7013d2613f4ef8e337b28b25452a9bd60e14