Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/sdl3' into sdl3
Browse files Browse the repository at this point in the history
  • Loading branch information
Taiko2k committed Jan 30, 2025
2 parents f74316f + 39a62ba commit c64d780
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_macOS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
gtk+3 \
pango \
pillow \
sdl2 \
sdl2_image \
sdl3 \
jpeg-xl \
ffmpeg \
librsvg \
opusfile \
libopenmpt \
wavpack \
game-music-emu
# sdl2_image \

# This generates 30MB of logs, enable it only when actively debugging something
# - name: "[DEBUG] List all Cellar files"
Expand Down
12 changes: 6 additions & 6 deletions mac.spec
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ a = Analysis(
("src/tauon/locale", "locale"),
("src/tauon/theme", "theme"),
("src/tauon/templates", "templates"),
# This could only have SDL2.framework and SDL2_image.framework to save space...
(f"{prefix}/lib/python{python_ver}/site-packages/sdl2dll/dll", "sdl2dll/dll"),
# (f".venv/lib/python{python_ver}/site-packages/sdl2dll/dll", "sdl2dll/dll"),
# (f".venv/lib/python{python_ver}/site-packages/sdl2dll/dll/SDL2.framework", "sdl2dll/dll/SDL2.framework"),
# (f".venv/lib/python{python_ver}/site-packages/sdl2dll/dll/SDL2_image.framework", "sdl2dll/dll/SDL2_image.framework"),
# This could only have SDL3.framework and SDL3_image.framework to save space...
# (f"{prefix}/lib/python{python_ver}/site-packages/sdl3dll/dll", "sdl3dll/dll"),
# (f".venv/lib/python{python_ver}/site-packages/sdl3dll/dll", "sdl3dll/dll"),
# (f".venv/lib/python{python_ver}/site-packages/sdl3dll/dll/SDL3.framework", "sdl3dll/dll/SDL3.framework"),
# (f".venv/lib/python{python_ver}/site-packages/sdl3dll/dll/SDL3_image.framework", "sdl3dll/dll/SDL3_image.framework"),
],
hiddenimports=[
"sdl2",
"sdl3",
"phazor",
"pylast",
# Zeroconf is hacked until this issue is resolved: https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/840
Expand Down

0 comments on commit c64d780

Please sign in to comment.