Skip to content

use latest sdl2 version and conan #87

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

Merged
petitlapin merged 2 commits into from
Feb 22, 2026
Merged

use latest sdl2 version and conan #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acd5e9d
use latest sdl2 version and conan
petitlapin Feb 22, 2026
2495490
enable mac again
petitlapin Feb 22, 2026
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: 3 additions & 4 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -39,7 +38,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
Expand All @@ -63,7 +62,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
Expand Down
3 changes: 2 additions & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading