From 8565573b5110f4cb0b87a53297b2ef86ecf89901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 6 Aug 2026 11:42:19 +0200
Subject: [PATCH] Buildfixes for Mac/Windows

---
 CMakeLists.txt                    |  2 ++
 SDL/SDLUtil.cpp                   |  6 ++++++
 headless/Headless.vcxproj         | 25 ++++++++++++++++++++++++-
 headless/Headless.vcxproj.filters |  6 ++++++
 headless/WindowsHeadlessHost.cpp  |  2 +-
 headless/WindowsHeadlessHost.h    |  2 +-
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fff8ce231..b91acbe094 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1344,6 +1344,8 @@ if(HEADLESS)
 		list(APPEND HeadlessSource
 			Common/Render/Text/draw_text_cocoa.mm
 			Common/Render/Text/draw_text_cocoa.h
+			SDL/SDLCocoaMetalLayer.h
+			SDL/SDLCocoaMetalLayer.mm
 		)
 		set_source_files_properties(Common/Render/Text/draw_text_cocoa.mm
 			PROPERTIES COMPILE_FLAGS -fobjc-arc)
diff --git a/SDL/SDLUtil.cpp b/SDL/SDLUtil.cpp
index 4131dd1753..d363f0790b 100644
--- a/SDL/SDLUtil.cpp
+++ b/SDL/SDLUtil.cpp
@@ -1,5 +1,11 @@
 #include <SDL3/SDL.h>
 
+#include "ppsspp_config.h"
+
+#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
+#include "SDL/SDLCocoaMetalLayer.h"
+#endif
+
 #include "Common/GPU/MiscTypes.h"
 #include "Common/GPU/Vulkan/VulkanLoader.h"
 #include "Common/GPU/Vulkan/VulkanContext.h"
diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj
index 5c242f2e47..4b5c3c192b 100644
--- a/headless/Headless.vcxproj
+++ b/headless/Headless.vcxproj
@@ -338,6 +338,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\SDL\SDLUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\Windows\CaptureDevice.cpp" />
     <ClCompile Include="..\Windows\GPU\D3D11Context.cpp" />
     <ClCompile Include="..\Windows\GPU\WindowsGLContext.cpp">
@@ -399,8 +407,23 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Common\GPU\Vulkan\VulkanGraphicsContext.h" />
+    <ClInclude Include="..\SDL\SDLUtil.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="Compare.h" />
-    <ClInclude Include="SDLHeadlessGLGraphicsContext.h" />
+    <ClInclude Include="SDLHeadlessGLGraphicsContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="WindowsHeadlessHost.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/headless/Headless.vcxproj.filters b/headless/Headless.vcxproj.filters
index fab3a363c6..473d7eb70b 100644
--- a/headless/Headless.vcxproj.filters
+++ b/headless/Headless.vcxproj.filters
@@ -25,6 +25,9 @@
     <ClCompile Include="..\Common\GPU\Vulkan\VulkanGraphicsContext.cpp">
       <Filter>Windows</Filter>
     </ClCompile>
+    <ClCompile Include="..\SDL\SDLUtil.cpp">
+      <Filter>Other Platforms</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\test.py" />
@@ -41,6 +44,9 @@
     <ClInclude Include="..\Common\GPU\Vulkan\VulkanGraphicsContext.h">
       <Filter>Windows</Filter>
     </ClInclude>
+    <ClInclude Include="..\SDL\SDLUtil.h">
+      <Filter>Other Platforms</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Windows">
diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp
index 23bdc8c823..43ef4cb803 100644
--- a/headless/WindowsHeadlessHost.cpp
+++ b/headless/WindowsHeadlessHost.cpp
@@ -23,7 +23,7 @@
 
 const bool WINDOW_VISIBLE = false;
 
-WindowDesc *CreateHiddenWindow(int w, int h, GPUBackend backend, WindowDesc *desc) {
+void *CreateHiddenWindow(int w, int h, GPUBackend backend, WindowDesc *desc) {
 	static WNDCLASSEX wndClass = {
 		sizeof(WNDCLASSEX),
 		CS_HREDRAW | CS_VREDRAW | CS_OWNDC,
diff --git a/headless/WindowsHeadlessHost.h b/headless/WindowsHeadlessHost.h
index 6d5617ae66..37b2bda757 100644
--- a/headless/WindowsHeadlessHost.h
+++ b/headless/WindowsHeadlessHost.h
@@ -23,4 +23,4 @@ struct WindowDesc;
 
 // Same API as for SDL
 void *CreateHiddenWindow(int w, int h, GPUBackend backend, WindowDesc *desc);
-void DestroyHiddenWindow(WindowDesc window);
+void DestroyHiddenWindow(void *window, WindowDesc desc);