Commitfc0f5b3

committed

Build Pyodide wheel

Disable link flags to let Emscripten take over for SDL3Disable Py_LIMITED_API definition to workaround issue with cffiRelated to#123

1 parent9392a48 commitfc0f5b3Copy full SHA for fc0f5b3

File tree

+40

-7

lines changed

+40

-7

lines changed

Lines changed: 26 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -321,8 +321,33 @@ jobs:`
`321`	`321`	`retention-days:7`
`322`	`322`	`compression-level:0`
`323`	`323`
	`324`	`+pyodide:`
	`325`	`+needs:[ruff, mypy, sdist]`
	`326`	`+runs-on:ubuntu-24.04`
	`327`	`+steps:`
	`328`	`+ -uses:actions/checkout@v4`
	`329`	`+with:`
	`330`	`+fetch-depth:${{ env.git-depth }}`
	`331`	`+ -name:Checkout submodules`
	`332`	`+run:git submodule update --init --recursive --depth 1`
	`333`	`+ -uses:libsdl-org/setup-sdl@6574e20ac65ce362cd12f9c26b3a5e4d3cd31dee`
	`334`	`+with:`
	`335`	`+install-linux-dependencies:true`
	`336`	`+build-type:"Debug"`
	`337`	`+version:${{ env.sdl-version }}`
	`338`	`+ -uses:pypa/cibuildwheel@v3.0.0`
	`339`	`+env:`
	`340`	`+CIBW_PLATFORM:pyodide`
	`341`	`+ -name:Archive wheel`
	`342`	`+uses:actions/upload-artifact@v4`
	`343`	`+with:`
	`344`	`+name:wheels-pyodide`
	`345`	`+path:wheelhouse/*.whl`
	`346`	`+retention-days:30`
	`347`	`+compression-level:0`
	`348`	`+`
`324`	`349`	`publish:`
`325`		`-needs:[sdist, build, build-macos, linux-wheels]`
	`350`	`+needs:[sdist, build, build-macos, linux-wheels, pyodide]`
`326`	`351`	`runs-on:ubuntu-latest`
`327`	`352`	`if:github.ref_type == 'tag'`
`328`	`353`	`environment:`

Lines changed: 1 addition & 0 deletions

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,12 @@ def walk_sources(directory: str) -> Iterator[str]:`
`162`	`162`
`163`	`163`	`libraries:list[str]= [*build_sdl.libraries]`
`164`	`164`	`library_dirs:list[str]= [*build_sdl.library_dirs]`
`165`		`-define_macros:list[tuple[str,Any]]= [("Py_LIMITED_API",Py_LIMITED_API)]`
	`165`	`+define_macros:list[tuple[str,Any]]= []`
	`166`	`+`
	`167`	`+if"PYODIDE"notinos.environ:`
	`168`	`+# Unable to apply Py_LIMITED_API to Pyodide in cffi<=1.17.1`
	`169`	`+# https://github.com/python-cffi/cffi/issues/179`
	`170`	`+define_macros.append(("Py_LIMITED_API",Py_LIMITED_API))`
`166`	`171`
`167`	`172`	`sources+=walk_sources("tcod/")`
`168`	`173`	`sources+=walk_sources("libtcod/src/libtcod/")`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -350,8 +350,9 @@ def get_cdef() -> tuple[str, dict[str, str]]:`
`350`	`350`	`libraries:list[str]= []`
`351`	`351`	`library_dirs:list[str]= []`
`352`	`352`
`353`		`-`
`354`		`-ifsys.platform=="darwin":`
	`353`	`+if"PYODIDE"inos.environ:`
	`354`	`+pass`
	`355`	`+elifsys.platform=="darwin":`
`355`	`356`	`extra_link_args+= ["-framework","SDL3"]`
`356`	`357`	`else:`
`357`	`358`	`libraries+= ["SDL3"]`
`@@ -382,6 +383,7 @@ def get_cdef() -> tuple[str, dict[str, str]]:`
`382`	`383`	`extra_compile_args+= (`
`383`	`384`	`subprocess.check_output(["pkg-config","sdl3","--cflags"],universal_newlines=True).strip().split()`
`384`	`385`	`)`
`385`		`-extra_link_args+= (`
`386`		`-subprocess.check_output(["pkg-config","sdl3","--libs"],universal_newlines=True).strip().split()`
`387`		`- )`
	`386`	`+if"PYODIDE"notinos.environ:`
	`387`	`+extra_link_args+= (`
	`388`	`+subprocess.check_output(["pkg-config","sdl3","--libs"],universal_newlines=True).strip().split()`
	`389`	`+ )`

Comments

(0)