diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-04-23 12:02:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 12:02:39 +1000 |
| commit | 305f6dc530dd3ed96b475fa8475c8fbf01292122 (patch) | |
| tree | 318e2484d1ffe5a41038c3187e24bb27849f3158 /tools | |
| parent | 6f05bd92a217b3313ae8009a8e668cb84854404b (diff) | |
| parent | 3a16fcd9dc273e4f5363408ad2d857e560e7966b (diff) | |
Merge pull request #21283 from fuzzard/android_ffmpeg
[android] fix building kodi for android on osx host due to ffmpeg linker issues
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 2748b0fbb5..f09258058b 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -19,6 +19,7 @@ if(CROSSCOMPILING) --enable-cross-compile --enable-pic --ar=${CMAKE_AR} + --ranlib=${CMAKE_RANLIB} --strip=${CMAKE_STRIP} ) diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 7e5f41b7b3..9f0014dec7 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -23,6 +23,9 @@ endif ifeq ($(CROSS_COMPILING), yes) CMAKE_ARGS+= -DPKG_CONFIG_EXECUTABLE=$(NATIVEPREFIX)/bin/pkg-config \ -DCROSSCOMPILING=$(CROSS_COMPILING) + -DCMAKE_AR=$(AR) \ + -DCMAKE_RANLIB=$(RANLIB) \ + -DCMAKE_STRIP=$(STRIP) endif ifeq ($(OS), android) |