diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a73856..170cf1e 100644 --- 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.71.0bi + SDK_VERSION: 3.1.73.2bi SYS_PYTHON: /usr/bin/python3 PACKAGES: emsdk pygame BUILD_STATIC: emsdk @@ -15,6 +15,7 @@ jobs: CYTHON: Cython-3.0.11-py2.py3-none-any.whl LD_VENDOR: -sUSE_GLFW=3 + steps: - uses: actions/checkout@v4.1.0 - name: pygame-wasm-builder prepare diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh index 27674f6..af0ecb7 100755 --- a/scripts/build-loader.sh +++ b/scripts/build-loader.sh @@ -204,7 +204,7 @@ if $STATIC then echo "building static loader" else - export PACKAGES=${BUILD_STATIC:-emsdk hpy _ctypes} + export PACKAGES=${BUILD_STATIC:-"emsdk hpy _ctypes"} echo "building dynamic loader @@ -246,7 +246,7 @@ touch ${INT_TEST} ${INC_TEST} ${LNK_TEST} ${MAIN_TEST} # -L${SDKROOT}/emsdk/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/pic only ! -if emcc -fPIC -std=gnu99 -D__PYDK__=1 -DNDEBUG $MIMALLOC $CPY_CFLAGS $CF_SDL $CPOPTS \ +if emcc -D__PYGBAG__ -fPIC -std=gnu99 -DNDEBUG $MIMALLOC $CPY_CFLAGS $CF_SDL $CPOPTS \ -DINC_TEST=$INC_TEST -DMAIN_TEST=$MAIN_TEST \ -c -fwrapv -Wall -Werror=implicit-function-declaration -fvisibility=hidden \ -I${PYDIR}/internal -I${PYDIR} -I./support -I./external/hpy/hpy/devel/include -DPy_BUILD_CORE \ @@ -265,7 +265,6 @@ then # --preload-file ${REQUIREMENTS}@/data/data/org.python/assets/site-packages \ # --preload-file ${ROOT}/support/xterm@/etc/termcap \ - # TODO: test -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION # --use-port=contrib.glfw3 @@ -323,15 +322,13 @@ then # -std=gnu99 -std=c++23 # EXTRA_EXPORTED_RUNTIME_METHODS => EXPORTED_RUNTIME_METHODS after 3.1.52 - -PG=/pgdata cat > final_link.sh <