diff options
| author | fuzzard <bmurphy@bcmcs.net> | 2019-04-30 20:26:09 +1000 |
|---|---|---|
| committer | fuzzard <bmurphy@bcmcs.net> | 2019-07-18 07:11:46 +1000 |
| commit | 3603621e010516de043e0811431ec37d59bc7104 (patch) | |
| tree | 98c2e9ef37c28e2e48bc8ef1bc9f2af3a7db2294 /tools/depends/target/ffmpeg | |
| parent | 7512bfcd60fc6630fc144449827e8c6b71c634e8 (diff) | |
[ios/build] rename core_system_name to darwin_embedded
implement darwin_embedded CORE_SYSTEM_NAME and OS.
This provides a single parent for ios/tvos common build code, and allows ios/tvos
specific code via CORE_PLATFORM_NAME
Diffstat (limited to 'tools/depends/target/ffmpeg')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 4a2622216c..5ee90c4b79 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -63,7 +63,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android) list(APPEND ffmpeg_conf --cpu=i686 --disable-mmx) endif() list(APPEND ffmpeg_conf --target-os=linux --extra-libs=-liconv --disable-linux-perf) -elseif(CORE_SYSTEM_NAME STREQUAL ios) +elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded) if(NOT CPU MATCHES arm64) list(APPEND ffmpeg_conf --cpu=cortex-a8) else() diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index c42e67e7da..731109ff24 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -43,7 +43,7 @@ ifeq ($(OS), android) endif ffmpg_config += --target-os=linux --extra-libs=-liconv --disable-linux-perf endif -ifeq ($(OS), ios) +ifeq ($(OS), darwin_embedded) ifneq ($(CPU), arm64) ffmpg_config += --cpu=cortex-a8 ffmpg_config += --as="$(NATIVEPREFIX)/bin/gas-preprocessor.pl -- $(CC)" @@ -81,7 +81,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure $(ffmpg_config) -ifeq ($(OS), ios) +ifeq ($(OS), darwin_embedded) cd $(PLATFORM); sed -i -- 's/HAVE_CLOCK_GETTIME 1/HAVE_CLOCK_GETTIME 0/g' config.h endif |