Skip to content

Commit acc670d

Browse files
committed
Bundle different versions of SDL for Windows and MacOS.
This puts off issues I've been having with MacOS.
1 parent a2e8798 commit acc670d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ v2.0.0
88

99
Unreleased
1010
------------------
11+
Changed
12+
- Now bundles SDL 2.0.10 for MacOS and SDL 2.0.14 for Windows.
13+
14+
Fixed
15+
- MacOS wheels were failing to bundle dependencies for SDL2.
1116

1217
11.19.1 - 2020-12-29
1318
--------------------

build_libtcod.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@
2323

2424
# The SDL2 version to parse and export symbols from.
2525
SDL2_PARSE_VERSION = os.environ.get("SDL_VERSION", "2.0.5")
26+
2627
# The SDL2 version to include in binary distributions.
27-
SDL2_BUNDLE_VERSION = os.environ.get("SDL_VERSION", "2.0.14")
28+
# MacOS delocate-wheel will fail without throwing an error when bundling
29+
# modern versions of SDL.
30+
SDL2_BUNDLE_VERSION = os.environ.get(
31+
"SDL_VERSION", "2.0.10" if sys.platform == "darwin" else "2.0.14"
32+
)
2833

2934
HEADER_PARSE_PATHS = ("tcod/", "libtcod/src/libtcod/")
3035
HEADER_PARSE_EXCLUDES = ("gl2_ext_.h", "renderer_gl_internal.h", "event.h")

0 commit comments

Comments
 (0)