From 36d8dbc590580bd5694b143c62350f092c4fcdb6 Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Fri, 9 Jan 2026 20:15:52 -0500 Subject: CommonFuncsObjC: Make function to fetch the current macOS version common --- Source/Core/Common/CMakeLists.txt | 2 ++ Source/Core/Common/CommonFuncs.h | 17 +++++++++++++++++ Source/Core/Common/CommonFuncsObjC.mm | 15 +++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 Source/Core/Common/CommonFuncsObjC.mm (limited to 'Source/Core/Common') diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index e134acabd3..fe7aa9f72b 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -204,6 +204,7 @@ if (APPLE) PRIVATE ${APPKIT_LIBRARY} ${COREFOUNDATION_LIBRARY} + ${FOUNDATION_LIBRARY} ${IOK_LIBRARY} ) elseif(WIN32) @@ -239,6 +240,7 @@ elseif(WIN32) ) elseif(APPLE) target_sources(common PRIVATE + CommonFuncsObjC.mm Logging/ConsoleListenerNix.cpp MemArenaDarwin.cpp ) diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index a2c20c67e3..b9238dad1c 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -8,6 +8,10 @@ #endif #include +#ifdef __APPLE__ +#include "Common/CommonTypes.h" +#endif + #ifndef _WIN32 // go to debugger mode @@ -61,4 +65,17 @@ std::string GetWin32ErrorString(unsigned long error_code); // Obtains a full path to the specified module. std::optional GetModuleName(void* hInstance); #endif + +#ifdef __APPLE__ +struct MacOSVersion // NSOperatingSystemVersion +{ + s64 major; // NSInteger majorVersion + s64 minor; // NSInteger minorVersion + s64 patch; // NSInteger patchVersion +}; + +// Helper function to get the current macOS version, which is easy to do with +// from Objective-C code, but a little harder from C++. +MacOSVersion GetMacOSVersion(); +#endif } // namespace Common diff --git a/Source/Core/Common/CommonFuncsObjC.mm b/Source/Core/Common/CommonFuncsObjC.mm new file mode 100644 index 0000000000..fdc7f48ce2 --- /dev/null +++ b/Source/Core/Common/CommonFuncsObjC.mm @@ -0,0 +1,15 @@ +// Copyright 2026 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "Common/CommonFuncs.h" + +#include + +namespace Common +{ +MacOSVersion GetMacOSVersion() +{ + const NSOperatingSystemVersion ver = [[NSProcessInfo processInfo] operatingSystemVersion]; + return {ver.majorVersion, ver.minorVersion, ver.patchVersion}; +} +} // namespace Common -- cgit v1.2.3