@@ -68,17 +68,23 @@ jobs:
68
68
shell : pwsh
69
69
70
70
- name : Setup Emscripten
71
- uses : mymindstorm/setup-emsdk@v14
72
- with :
73
- version : ${{ env.EMSDK_VERSION }}
74
- actions-cache-folder : emsdk-cache
71
+ run : |
72
+ git clone https://github.com/emscripten-core/emsdk.git
73
+ cd emsdk
74
+ ./emsdk install ${{ env.EMSDK_VERSION }}
75
+ ./emsdk activate ${{ env.EMSDK_VERSION }}
76
+ echo "EMSDK=${{ github.workspace }}/emsdk" >> $GITHUB_ENV
77
+ echo "${{ github.workspace }}/emsdk" >> $GITHUB_PATH
78
+ echo "${{ github.workspace }}/emsdk/upstream/emscripten" >> $GITHUB_PATH
79
+ shell : bash
75
80
76
- - name : Configure VCPKG
81
+ - name : Configure OCCT with vcpkg
77
82
shell : bash
78
83
run : |
84
+ source ${{ github.workspace }}/emsdk/emsdk_env.sh
79
85
mkdir -p build-${{ matrix.build_type }}
80
- set VCPKG_ROOT=${{ github.workspace }}/vcpkg
81
86
cd build-${{ matrix.build_type }}
87
+ set VCPKG_ROOT=${{ github.workspace }}/vcpkg
82
88
emcmake cmake -G "Ninja" ^
83
89
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ^
84
90
-DVCPKG_TARGET_TRIPLET=wasm32-emscripten ^
@@ -101,8 +107,7 @@ jobs:
101
107
-DUSE_OPENGL=ON ^
102
108
-DINSTALL_DIR="${{ github.workspace }}/install-wasm-${{ matrix.build_type }}" ^
103
109
-DCMAKE_CXX_FLAGS="-s WASM=1 -s EXPORTED_RUNTIME_METHODS=['ccall','cwrap'] -s ALLOW_MEMORY_GROWTH=1" ^
104
- -DCMAKE_EXECUTABLE_SUFFIX=".js" ^
105
- ..
110
+ -DCMAKE_EXECUTABLE_SUFFIX=".js" ^ ..
106
111
107
112
- name : Build
108
113
shell : bash
0 commit comments