From 39e2d2accd3f23c8ad3573dec6bc7be09d5068c9 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Sun, 15 Oct 2023 14:31:09 -0400 Subject: [PATCH] libretro: build tvos with ffmpeg --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec27838610..e25c599bbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,4 +158,4 @@ libretro-build-tvos-arm64: - .core-defs - .cmake-defs variables: - CORE_ARGS: -DIOS_PLATFORM=TVOS -DUSE_FFMPEG=NO -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DLIBRETRO=ON + CORE_ARGS: -DIOS_PLATFORM=TVOS -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DLIBRETRO=ON diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b77f20e27..b80d8cdd07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -901,7 +901,11 @@ if(USE_FFMPEG) set(PLATFORM_ARCH "android/x86") endif() elseif(IOS) - set(PLATFORM_ARCH "ios/universal") + if(IOS_PLATFORM STREQUAL "TVOS") + set(PLATFORM_ARCH "tvos/arm64") + else() + set(PLATFORM_ARCH "ios/universal") + endif() elseif(MACOSX) set(PLATFORM_ARCH "macosx/universal") elseif(LINUX)