Now building MacOS

Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk>
DynamicDevices · Jul 20, 2024 · 3056eb0 · 3056eb0
1 parent 266bf83
commit 3056eb0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/.github/actions/compile_gdextension/action.yml b/.github/actions/compile_gdextension/action.yml
@@ -164,7 +164,10 @@ runs:
       if: inputs.platform == 'web'
       shell: bash
       run: |
-        echo "::group::🛠️ Opus Compilation (WASM32 TBD) 🛠️"
+        echo "::group::🛠️ Opus Compilation (WASM32) 🛠️"
+        cd opus
+        emconfigure ./configure --disable-intrinsics --disable-rtcd CFLAGS='-O2'
+        make
 
     - name: Add msbuild to PATH
       if: runner.os == 'Windows'

diff --git a/.github/workflows/gdextension_build.yml b/.github/workflows/gdextension_build.yml
@@ -219,44 +219,44 @@ jobs:
 
   # ============================================
 
-#  web-gdextension:
-#    name: 🕸 Web
-#    runs-on: ubuntu-latest
-#
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        arch: [wasm32]
-#        target: [template_debug, template_release]
-#
-#    env:
-#      EM_VERSION: 3.1.39
-#
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#
-#      - name: Download Emscripten
-#        uses: mymindstorm/setup-emsdk@v14
-#        # Continue if failed to cache
-#        # https://github.com/mymindstorm/setup-emsdk/issues/20
-#        continue-on-error: true
-#        with:
-#          version: ${{env.EM_VERSION}}
-#          actions-cache-folder: obj/emsdk_cache
-#
-#      - name: Compile GDExtension
-#        uses: ./.github/actions/compile_gdextension
-#        with:
-#          platform: web
-#          target: ${{matrix.target}}
-#          arch: ${{matrix.arch}}
-#          artifact: web.${{matrix.target}}.${{matrix.arch}}
-#          additional: lto=yes
-#          output_libs_path: ${{env.OUTPUT_LIBS_PATH}}
-#          use_cache: ${{env.USE_CACHE}}
+  web-gdextension:
+    name: 🕸 Web
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [wasm32]
+        target: [template_debug, template_release]
+
+    env:
+      EM_VERSION: 3.1.39
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Download Emscripten
+        uses: mymindstorm/setup-emsdk@v14
+        # Continue if failed to cache
+        # https://github.com/mymindstorm/setup-emsdk/issues/20
+        continue-on-error: true
+        with:
+          version: ${{env.EM_VERSION}}
+          actions-cache-folder: obj/emsdk_cache
+
+      - name: Compile GDExtension
+        uses: ./.github/actions/compile_gdextension
+        with:
+          platform: web
+          target: ${{matrix.target}}
+          arch: ${{matrix.arch}}
+          artifact: web.${{matrix.target}}.${{matrix.arch}}
+          additional: lto=yes
+          output_libs_path: ${{env.OUTPUT_LIBS_PATH}}
+          use_cache: ${{env.USE_CACHE}}
 
   # ============================================
 
@@ -267,7 +267,7 @@ jobs:
         linux-gdextension,
         macos-gdextension,
         android-gdextension,
-#        web-gdextension,
+        web-gdextension,
         ios-gdextension,
       ]
     name: 📦 Collect GDExtension binaries