fix linking > 3.13

pygame-web · Oct 20, 2024 · cb3039f · cb3039f
1 parent 21d50e6
commit cb3039f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,6 +47,7 @@ jobs:
 #            cd $GITHUB_WORKSPACE
 #            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy" bash ./scripts/build-loader.sh
 #
+#   PACKAGES="emsdk pygame" BUILD_STATIC="emsdk"
 
     - name: build 3.12 packages
       run: |
@@ -61,12 +62,12 @@ jobs:
     - name: build 3.13 packages
       run: |
             cd $GITHUB_WORKSPACE
-            PYBUILD=3.13 PACKAGES="emsdk pygame" BUILD_STATIC="emsdk" bash ./scripts/build-pkg.sh
+            PYBUILD=3.13 bash ./scripts/build-pkg.sh
 
     - name: build 3.13 loader
       run: |
             cd $GITHUB_WORKSPACE
-            PYBUILD=3.13 PACKAGES="emsdk pygame" BUILD_STATIC="emsdk" bash ./scripts/build-loader.sh
+            PYBUILD=3.13 bash ./scripts/build-loader.sh
 
     - name: build 3.14 packages
       run: |

diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh
@@ -269,20 +269,21 @@ then
 # TODO: test -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION
 
 # --use-port=contrib.glfw3
+    #LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
 
-    LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
     LDFLAGS="-sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
 
 
     LDFLAGS="-L${SDKROOT}/devices/emsdk/usr/lib $LDFLAGS -lssl -lcrypto -lsqlite3 -lffi -lbz2 -lz -ldl -lm"
 
     LINKPYTHON="python mpdec expat"
 
-    if [ ${PYMINOR} -ge 12 ]
+    if [ ${PYMINOR} -ge 11 ]
     then
-        LINKPYTHON="Hacl_Hash_SHA2 $LINKPYTHON"
+        LINKPYTHON="Hacl_Hash_SHA2 Hacl_Hash_Blake2 $LINKPYTHON"
     fi
 
+
     for lib in $LINKPYTHON
     do
         cpylib=${SDKROOT}/prebuilt/emsdk/lib${lib}${PYBUILD}.a