bump sdk

pygame-web · Nov 17, 2024 · 8f93851 · 8f93851
1 parent c39774f
commit 8f93851
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        SDK_VERSION: 3.1.70.7bi
+        SDK_VERSION: 3.1.71.0bi
         SYS_PYTHON: /usr/bin/python3
         PACKAGES: emsdk pygame
         BUILD_STATIC: emsdk

diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh
@@ -119,7 +119,7 @@ fi
 export PATCH_FS="--preload-file $(realpath platform_wasm/platform_wasm)@/data/data/org.python/assets/site-packages/platform_wasm"
 
 # =2 will break pyodide module reuses
-LOPTS="-sMAIN_MODULE=1"
+LOPTS="-sENVIRONMENT=web -sMAIN_MODULE=1"
 
 # O0/g3 is much faster to build and easier to debug
 
@@ -327,12 +327,13 @@ then
 PG=/pgdata
     cat > final_link.sh <<END
 #!/bin/bash
-emcc -sENVIRONMENT=web \\
+. $SDKROOT/emsdk/emsdk_env.sh
+emcc \\
  $FINAL_OPTS \\
  $LOPTS \\
  -D__PYDK__=1 -DNDEBUG  \\
-     -sTOTAL_MEMORY=256MB -sSTACK_SIZE=4MB -sALLOW_TABLE_GROWTH -sALLOW_MEMORY_GROWTH \\
-    -sEXPORTED_RUNTIME_METHODS=FS \\
+     -sTOTAL_MEMORY=256MB -sSTACK_SIZE=8MB -sALLOW_TABLE_GROWTH -sALLOW_MEMORY_GROWTH \\
+    -sEXPORTED_RUNTIME_METHODS=FS,print \\
      $CF_SDL \\
      --use-preload-plugins \\
      $STDLIBFS \\

diff --git a/scripts/build-pkg.sh b/scripts/build-pkg.sh
@@ -113,7 +113,7 @@ mkdir -p build
 for pkg in ${PACKAGES}
 do
 
-    PKG_PATH=packages.d/${pkg}/${pkg}
+    export PKG_PATH=packages.d/${pkg}/${pkg}
 
     pkg_script=${PKG_PATH}.sh