try 1

GameDevTecnico · Nov 22, 2024 · f6a2ab0 · f6a2ab0
1 parent 160ba99
commit f6a2ab0
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
@@ -11,7 +11,7 @@ env:
   BUILD_TYPE: Release
   CCACHE_BASEDIR: ${{ github.workspace }}
   CCACHE_DIR: "${{ github.workspace }}/.ccache"
-  CCACHE_COMPILERTYPE: gcc
+  CCACHE_COMPILERTYPE: emcc
   CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/cmake/Emscripten.cmake
 
 jobs:
@@ -21,7 +21,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Emscripten
+    - name: Install emsdk
       uses: mymindstorm/setup-emsdk@v14
 
     - name: Install dependencies
@@ -46,19 +46,16 @@ jobs:
           ccache-
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCUBOS_CORE_SAMPLES=ON  -DCUBOS_ENGINE_SAMPLES=ON -DCMAKE_TOOLCHAIN_FILE=${{env.CMAKE_TOOLCHAIN_FILE}}
+      run: emcmake cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCUBOS_CORE_SAMPLES=ON  -DCUBOS_ENGINE_SAMPLES=ON -DCMAKE_TOOLCHAIN_FILE=${{env.CMAKE_TOOLCHAIN_FILE}}
       shell: bash
-      env:
-        CC:   emcc
-        CXX:  em++
 
     - name: CCache Prolog
       run: |-
         ccache -s # Print current cache stats
         ccache -z # Zero cache entry
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all
+      run: emcmake cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all
 
     - name: CCache Epilog
       run: |