From b4dbb67a7502f6e91f8b952d04cd906b2e4a1460 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Mon, 8 May 2023 11:22:04 -0400 Subject: [PATCH] Build the HW core for tvOS --- .gitlab-ci.yml | 5 +++++ Makefile | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74661f6e..65611758 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -240,3 +240,8 @@ libretro-build-tvos-arm64: extends: - .libretro-tvos-arm64-make-default - .core-defs + +libretro-build-tvos-arm64-hw: + extends: + - .libretro-tvos-arm64-make-default + - .core-defs-hw diff --git a/Makefile b/Makefile index 3a8ff36d..a2484d5c 100644 --- a/Makefile +++ b/Makefile @@ -199,11 +199,19 @@ else ifeq ($(platform), tvos-arm64) fpic := -fPIC SHARED := -dynamiclib HAVE_LIGHTREC = 0 - FLAGS += -DHAVE_UNISTD_H + FLAGS += -DHAVE_UNISTD_H -DIOS=1 -DTVOS=1 -ifeq ($(IOSSDK),) - IOSSDK := $(shell xcodebuild -version -sdk appletvos Path) -endif + ifeq ($(IOSSDK),) + IOSSDK := $(shell xcrun -sdk appletvos -show-sdk-path) + endif + ifeq ($(HAVE_OPENGL),1) + GL_LIB := -framework OpenGLES + GLES = 1 + GLES3 = 1 + endif + + CC = cc -arch arm64 -isysroot $(IOSSDK) + CXX = c++ -arch arm64 -isysroot $(IOSSDK) # QNX else ifeq ($(platform), qnx)