From 75681e46ee5f1c79dd37ef8163100ca2233be8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Mon, 12 Jan 2026 11:31:42 -0500 Subject: [PATCH 1/2] Fix libretro builds for iOS and Windows --- CMakeLists.txt | 2 +- libretro/libretro-common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc4b305538..6b0d4fe51d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1676,7 +1676,7 @@ if(ANDROID) endif() endif() -if (IOS) +if (IOS AND NOT LIBRETRO) set(nativeExtra ${nativeExtra} ${NativeAppSource}) endif() diff --git a/libretro/libretro-common b/libretro/libretro-common index 7c56a43b42..76a3d54feb 160000 --- a/libretro/libretro-common +++ b/libretro/libretro-common @@ -1 +1 @@ -Subproject commit 7c56a43b424716b6b0fd36239d6329e9e2e1afe6 +Subproject commit 76a3d54feb0ee0ce9d59b90aa24694f3782063d3 From aea42e2cc581a7bd258ff4bf148822ab9532685a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Mon, 12 Jan 2026 11:50:40 -0500 Subject: [PATCH 2/2] Change `RETRO_HW_CONTEXT_DIRECT3D` to `RETRO_HW_CONTEXT_D3D11` --- libretro/LibretroD3D11Context.h | 2 +- libretro/LibretroGraphicsContext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libretro/LibretroD3D11Context.h b/libretro/LibretroD3D11Context.h index 3a3a4a759c..b47755876c 100644 --- a/libretro/LibretroD3D11Context.h +++ b/libretro/LibretroD3D11Context.h @@ -6,7 +6,7 @@ class LibretroD3D11Context : public LibretroHWRenderContext { public: - LibretroD3D11Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 11) {} + LibretroD3D11Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_D3D11, 11) {} bool Init() override; void SwapBuffers() override; diff --git a/libretro/LibretroGraphicsContext.cpp b/libretro/LibretroGraphicsContext.cpp index a5d6f2931e..cc7a272e27 100644 --- a/libretro/LibretroGraphicsContext.cpp +++ b/libretro/LibretroGraphicsContext.cpp @@ -133,7 +133,7 @@ LibretroGraphicsContext *LibretroGraphicsContext::CreateGraphicsContext() { #endif #ifdef _WIN32 - if (preferred == RETRO_HW_CONTEXT_DUMMY || preferred == RETRO_HW_CONTEXT_DIRECT3D) { + if (preferred == RETRO_HW_CONTEXT_DUMMY || preferred == RETRO_HW_CONTEXT_D3D11) { ctx = new LibretroD3D11Context(); if (ctx->Init()) {