From acd5e9d5a0493a0af46d4fbdda98b21fafa12817 Mon Sep 17 00:00:00 2001 From: Johnny Jazeix Date: Sun, 22 Feb 2026 19:01:19 +0100 Subject: [PATCH 1/2] use latest sdl2 version and conan --- .github/workflows/c-cpp.yml | 6 +++--- conanfile.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index f5a653d..b2e10f1 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -13,7 +13,7 @@ jobs: - name: Install Conan uses: turtlebrowser/get-conan@main with: - version: 2.8.1 + version: 2.25.2 - name: Configure conan run: conan profile detect - name: Install deps @@ -39,7 +39,7 @@ jobs: - name: Get Conan uses: turtlebrowser/get-conan@main with: - version: 2.8.1 + version: 2.25.2 - name: Configure conan run: conan profile detect - name: Install deps @@ -63,7 +63,7 @@ jobs: - name: Install Conan uses: turtlebrowser/get-conan@main with: - version: 2.8.1 + version: 2.25.2 - name: Configure conan run: conan profile detect diff --git a/conanfile.py b/conanfile.py index 8d3d7cf..9a3ade6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -3,7 +3,8 @@ class LiRi(ConanFile): settings = "os", "compiler", "build_type", "arch" - requires = "sdl/[~2.28.5]", "sdl_mixer/[~2.8.0]", "openssl/1.1.1w" + requires = "sdl/2.32.10", "sdl_mixer/2.8.1", "openssl/1.1.1w" + tool_requires = "cmake/4.2.1" def layout(self): cmake_layout(self) From 2495490251bbce47fe99f6e78dd8031ebdb61e6e Mon Sep 17 00:00:00 2001 From: Johnny Jazeix Date: Sun, 22 Feb 2026 19:16:00 +0100 Subject: [PATCH 2/2] enable mac again --- .github/workflows/c-cpp.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index b2e10f1..b68c191 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -29,7 +29,6 @@ jobs: name: ubuntu path: build/Li_ri-*.sh mac: - if: ${{ false }} # disable until libmodplug works with recent cmake version runs-on: macos-14 steps: - uses: actions/checkout@v6.0.1