Skip to content

Commit d5ecd87

Browse files
committed
Fix builds for FFmpeg and OpenBLAS on Mac
1 parent aebfd24 commit d5ecd87

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
link = "[email protected]", compiler = {"default", "nodeprecated"}),
6666
@Platform(value = "linux-x86", preload = {"[email protected]", "[email protected]", "[email protected]"}, preloadpath = {"/usr/lib32/", "/usr/lib/"}),
6767
@Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}),
68+
@Platform(value = "macosx", preload = {"[email protected]"},
69+
preloadpath = {"/usr/local/lib/gcc/13/", "/usr/local/lib/gcc/12/", "/usr/local/lib/gcc/11/", "/usr/local/lib/gcc/10/", "/usr/local/lib/gcc/9/",
70+
"/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}),
6871
@Platform(value = "windows", includepath = {"C:/MinGW/local/include/ffmpeg/", "C:/MinGW/include/ffmpeg/"}, preload = "avutil-59"),
6972
@Platform(extension = "-gpl")
7073
}

openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
@Platform(define = {"__OPENBLAS 1", "LAPACK_COMPLEX_CPP"},
4545
include = {"openblas_config.h", "cblas.h"},
4646
link = "[email protected]", resource = {"include", "lib"},
47-
47+
4848
preloadpath = {"/opt/intel/oneapi/mkl/latest/lib/", "/opt/intel/oneapi/compiler/latest/mac/compiler/lib/"}),
4949
@Platform(value = "android", link = "openblas", preload = ""),
50-
@Platform(value = "macosx-x86_64", preloadpath = {"/usr/local/lib/gcc/12/", "/usr/local/lib/gcc/11/", "/usr/local/lib/gcc/10/", "/usr/local/lib/gcc/9/",
51-
"/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}),
50+
@Platform(value = "macosx", preloadpath = {"/usr/local/lib/gcc/13/", "/usr/local/lib/gcc/12/", "/usr/local/lib/gcc/11/", "/usr/local/lib/gcc/10/", "/usr/local/lib/gcc/9/",
51+
"/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}),
5252
@Platform(value = "windows", preload = "libopenblas#libopenblas_nolapack"),
5353
@Platform(value = "windows-x86", preloadpath = {"C:/Program Files (x86)/Intel/oneAPI/mkl/latest/redist/ia32/",
5454
"C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/redist/ia32_win/compiler/"}),

0 commit comments

Comments
 (0)