Skip to content

Commit 43e7916

Browse files
committed
Upgrade opencv version used for cimbar.js wasm build
+ also use a newer emscripten docker image.
1 parent 75d6cfb commit 43e7916

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616

1717
- name: Get openCV
1818
run: |
19-
wget https://github.com/opencv/opencv/archive/refs/tags/4.5.5.zip
20-
unzip 4.5.5.zip
21-
mv opencv-4.5.5 opencv4
19+
wget https://github.com/opencv/opencv/archive/refs/tags/4.10.0.zip
20+
unzip 4.10.0.zip
21+
mv opencv-4.10.0 opencv4
2222
2323
- name: Run the build process with Docker
2424
uses: addnab/docker-run-action@v3
2525
with:
26-
image: emscripten/emsdk:3.1.39
26+
image: emscripten/emsdk:3.1.69
2727
options: -v ${{ github.workspace }}:/usr/src/app
2828
shell: bash
2929
run: |

package-wasm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:3.1.39
2+
#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:3.1.69 bash
33

44
cd /usr/src/app
55

src/third_party_lib/wirehair/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ set(GEN_TABLES
5454
gf256.h
5555
)
5656

57-
if(NOT ANDROID)
57+
if(NOT ANDROID AND NOT USE_WASM)
5858
set(ARCH_NATIVE "-march=native")
5959
endif()
6060

0 commit comments

Comments
 (0)