File tree 4 files changed +44
-15
lines changed
4 files changed +44
-15
lines changed Original file line number Diff line number Diff line change @@ -14,19 +14,12 @@ jobs:
14
14
fail-fast : false
15
15
matrix :
16
16
ver :
17
- - { cv: 4.8.1 }
17
+ - { cv: 4.8.1, ndk: 25.2.9519653 }
18
18
19
19
env :
20
20
PKG_NAME : opencv-${{ matrix.ver.cv }}-android
21
21
22
22
steps :
23
- # Setup JDK 11
24
- - name : Set up JDK 11
25
- uses : actions/setup-java@v3
26
- with :
27
- java-version : ' 11'
28
- distribution : ' adopt'
29
-
30
23
# 删除ndk -g参数
31
24
- name : ndk del -g
32
25
run : sed -i -e '/^ -g$/d' $ANDROID_NDK_HOME/build/cmake/android-legacy.toolchain.cmake
Original file line number Diff line number Diff line change @@ -26,11 +26,11 @@ jobs:
26
26
JAVA_PKG_NAME : opencv-${{ matrix.ver.cv }}-macos-${{ matrix.list.os_ver }}-java
27
27
28
28
steps :
29
- # Setup JDK 11
30
- - name : Set up JDK 11
29
+ # Setup JDK 8
30
+ - name : Set up JDK 8
31
31
uses : actions/setup-java@v3
32
32
with :
33
- java-version : ' 11 '
33
+ java-version : ' 8 '
34
34
distribution : ' adopt'
35
35
36
36
- uses : cedx/setup-ant@v2
Original file line number Diff line number Diff line change @@ -33,11 +33,11 @@ jobs:
33
33
JAVA_PKG_NAME : opencv-${{ matrix.ver.cv }}-windows-${{ matrix.list.vs_name }}-java-${{ matrix.crt }}
34
34
35
35
steps :
36
- # Setup JDK 11
37
- - name : Set up JDK 11
36
+ # Setup JDK 8
37
+ - name : Set up JDK 8
38
38
uses : actions/setup-java@v3
39
39
with :
40
- java-version : ' 11 '
40
+ java-version : ' 8 '
41
41
distribution : ' adopt'
42
42
43
43
- uses : cedx/setup-ant@v2
Original file line number Diff line number Diff line change @@ -16,4 +16,40 @@ OpenCV在OCR中只是做图像的读取保存、编解码、缩放等,可以
16
16
17
17
编译选项添加BUILD_WITH_STATIC_CRT=ON
18
18
19
- ### 关于LINUX musl工具链编译
19
+ ## 编译环境
20
+ ### Android
21
+ | 操作系统 | ndk |
22
+ | ---| ---|
23
+ | ubuntu 22.04 | 25.2.9519653 |
24
+
25
+ ### Windows
26
+ | 操作系统 | vs版本 | JDK | ant |
27
+ | ---| ---| -----| ---|
28
+ | 2019 | vs2017 | 8 | 1.10.14 |
29
+ | 2019 | vs2019 | 8 | 1.10.14 |
30
+ | 2022 | vs2022 | 8 | 1.10.14 |
31
+
32
+ ### Ubuntu
33
+ | 操作系统 | gcc | libc | binutils | JDK| ant|
34
+ | ---| ---| ---| ---| ---| ---|
35
+ | ubuntu 14.04 | 4.8.4 | 2.19 | 2.24 | 8 | 1.10.14 |
36
+ | ubuntu 16.04 | 5.4.0 | 2.23 | 2.26.1 | 8 | 1.10.14 |
37
+ | ubuntu 18.04 | 7.5.0 | 2.27 | 2.30 | 8 | 1.10.14 |
38
+ | ubuntu 20.04 | 9.4.0 | 2.31 | 2.34 | 8 | 1.10.14 |
39
+ | ubuntu 22.04 | 11.4.0 | 2.35 | 2.38 | 8 | 1.10.14 |
40
+
41
+ ### Musl
42
+ | 操作系统 | musl |
43
+ | ---| ---|
44
+ | ubuntu 22.04 | 11.3.1 |
45
+
46
+ ### Macos
47
+ | 操作系统 | JDK | ant|
48
+ | ---| ---| ---|
49
+ | 10 | 8 | 1.10.14 |
50
+ | 11 | 8 | 1.10.14 |
51
+ | 12 | 8 | 1.10.14 |
52
+ | 13 | 8 | 1.10.14 |
53
+
54
+
55
+
You can’t perform that action at this time.
0 commit comments