Merge pull request #11527 from Hibyehello/MacOSPlatform

NoGUI: Create MacOS platform
dolphin-emu · Jun 2, 2023 · 4c9210b · 4c9210b
2 parents 4ee2740 + 8324a85
commit 4c9210b
Show file tree

Hide file tree

Showing 4 changed files with 451 additions and 0 deletions.
diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt
@@ -13,6 +13,11 @@ if(WIN32)
   target_sources(dolphin-nogui PRIVATE PlatformWin32.cpp)
 endif()
 
+if(APPLE)
+  target_sources(dolphin-nogui PRIVATE PlatformMacos.mm)
+  target_compile_options(dolphin-nogui PRIVATE -fobjc-arc)
+endif()
+
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   target_sources(dolphin-nogui PRIVATE PlatformFBDev.cpp)
 endif()
@@ -26,6 +31,15 @@ PRIVATE
   cpp-optparse
 )
 
+if(APPLE)
+  target_link_libraries(dolphin-nogui
+    PRIVATE
+      ${APPKIT_LIBRARY}
+      ${COREFOUNDATION_LIBRARY}
+      ${IOK_LIBRARY}
+  )
+endif()
+
 if(MSVC)
   # Add precompiled header
   target_link_libraries(dolphin-nogui PRIVATE use_pch)

diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
@@ -168,6 +168,10 @@ static std::unique_ptr<Platform> GetPlatform(const optparse::Values& options)
   if (platform_name == "win32" || platform_name.empty())
     return Platform::CreateWin32Platform();
 #endif
+#ifdef __APPLE__
+  if (platform_name == "macos" || platform_name.empty())
+    return Platform::CreateMacOSPlatform();
+#endif
 
   if (platform_name == "headless" || platform_name.empty())
     return Platform::CreateHeadlessPlatform();
@@ -198,6 +202,10 @@ int main(int argc, char* argv[])
 #ifdef _WIN32
             ,
             "win32"
+#endif
+#ifdef __APPLE__
+            ,
+            "macos"
 #endif
       });
 

diff --git a/Source/Core/DolphinNoGUI/Platform.h b/Source/Core/DolphinNoGUI/Platform.h
@@ -43,6 +43,10 @@ class Platform
   static std::unique_ptr<Platform> CreateWin32Platform();
 #endif
 
+#ifdef __APPLE__
+  static std::unique_ptr<Platform> CreateMacOSPlatform();
+#endif
+
 protected:
   void UpdateRunningFlag();