Skip to content

Commit 111b614

Browse files
committed
Update SDL to 3.2.16
Note libtcod version as well
1 parent 8a30b58 commit 111b614

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/python-package.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ defaults:
1414

1515
env:
1616
git-depth: 0 # Depth to search for tags.
17+
sdl-version: "3.2.16" # SDL version to bundle
1718

1819
jobs:
1920
ruff:
@@ -48,7 +49,7 @@ jobs:
4849
with:
4950
install-linux-dependencies: true
5051
build-type: "Debug"
51-
version: "3.2.14"
52+
version: ${{ env.sdl-version }}
5253
- uses: actions/checkout@v4
5354
with:
5455
fetch-depth: ${{ env.git-depth }}
@@ -72,7 +73,7 @@ jobs:
7273
strategy:
7374
matrix:
7475
os: ["windows-latest", "macos-latest"]
75-
sdl-version: ["3.2.10"]
76+
sdl-version: ["3.2.16"]
7677
fail-fast: true
7778
steps:
7879
- uses: actions/checkout@v4
@@ -129,7 +130,7 @@ jobs:
129130
with:
130131
install-linux-dependencies: true
131132
build-type: "Release"
132-
version: "3.2.14"
133+
version: ${{ env.sdl-version }}
133134
- name: Install Python dependencies
134135
run: |
135136
python -m pip install --upgrade pip
@@ -172,7 +173,7 @@ jobs:
172173
with:
173174
install-linux-dependencies: true
174175
build-type: "Debug"
175-
version: "3.2.14"
176+
version: ${{ env.sdl-version }}
176177
- uses: actions/checkout@v4
177178
with:
178179
fetch-depth: ${{ env.git-depth }}
@@ -214,7 +215,7 @@ jobs:
214215
with:
215216
install-linux-dependencies: true
216217
build-type: "Debug"
217-
version: "3.2.14"
218+
version: ${{ env.sdl-version }}
218219
- name: Run tox
219220
run: |
220221
tox -vv
@@ -265,7 +266,7 @@ jobs:
265266
systemd-devel mesa-libGL-devel libxkbcommon-devel mesa-libGLES-devel \
266267
mesa-libEGL-devel vulkan-devel wayland-devel wayland-protocols-devel \
267268
libdrm-devel mesa-libgbm-devel libusb-devel
268-
git clone --depth 1 --branch release-3.2.10 https://github.com/libsdl-org/SDL.git sdl_repo &&
269+
git clone --depth 1 --branch release-${{env.sdl-version}} https://github.com/libsdl-org/SDL.git sdl_repo &&
269270
cmake -S sdl_repo -B sdl_build &&
270271
cmake --build sdl_build --config Release &&
271272
cmake --install sdl_build --config Release --prefix /usr/local &&

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/) since version
88

99
### Changed
1010

11-
- Switched to SDL3.
11+
- Updated libtcod to 2.1.1
12+
- Updated SDL to 3.2.16
1213
This will cause several breaking changes such as the names of keyboard constants and other SDL enums.
1314
- `tcod.sdl.video.Window.grab` has been split into `.mouse_grab` and `.keyboard_grab` attributes.
1415
- `tcod.event.KeySym` single letter symbols are now all uppercase.

build_sdl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
# Reject versions of SDL older than this, update the requirements in the readme if you change this.
3434
SDL_MIN_VERSION = (3, 2, 0)
3535
# The SDL version to parse and export symbols from.
36-
SDL_PARSE_VERSION = os.environ.get("SDL_VERSION", "3.2.10")
36+
SDL_PARSE_VERSION = os.environ.get("SDL_VERSION", "3.2.16")
3737
# The SDL version to include in binary distributions.
38-
SDL_BUNDLE_VERSION = os.environ.get("SDL_VERSION", "3.2.10")
38+
SDL_BUNDLE_VERSION = os.environ.get("SDL_VERSION", "3.2.16")
3939

4040

4141
# Used to remove excessive newlines in debug outputs.

0 commit comments

Comments
 (0)