moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fastmem: Fix iOS/OSX checks (#813)

Browse Source
This commit is contained in:
wheremyfoodat
2025-10-12 05:31:33 +03:00
committed by GitHub
parent 40da62f0cd
commit bac050fc4b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
third_party/host_memory/host_memory.cpp vendored
View File

@@ -379,7 +379,8 @@ namespace Common {
std::unordered_map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset std::unordered_map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset
}; };
#elif (defined(__linux__) || defined(__FreeBSD__)) || defined(TARGET_OS_OSX) && defined(PANDA3DS_HARDWARE_FASTMEM) // ^^^ Windows ^^^ vvv Linux vvv #elif (defined(__linux__) || defined(__FreeBSD__)) || \
(defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) && defined(PANDA3DS_HARDWARE_FASTMEM) // ^^^ Windows ^^^ vvv Linux vvv
#ifdef __ANDROID__ #ifdef __ANDROID__
#define ASHMEM_DEVICE "/dev/ashmem" #define ASHMEM_DEVICE "/dev/ashmem"
@@ -481,7 +482,7 @@ namespace Common {
long page_size = sysconf(_SC_PAGESIZE); long page_size = sysconf(_SC_PAGESIZE);
if (page_size != 0x1000) { if (page_size != 0x1000) {
Helpers::warn("Page size %X is incompatible with 4K paging", page_size); Helpers::warn("Page size 0x%X is incompatible with 4K paging", page_size);
throw std::bad_alloc{}; throw std::bad_alloc{};
} }
@@ -491,7 +492,7 @@ namespace Common {
fd = shm_open(SHM_ANON, O_RDWR, 0600); fd = shm_open(SHM_ANON, O_RDWR, 0600);
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
fd = AshmemCreateFileMapping("HostMemory", 0); fd = AshmemCreateFileMapping("HostMemory", 0);
#elif defined(TARGET_OS_OSX) #elif defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1
// Shove file in a temp directory since MacOS app bundles and iOS apps run sandboxed // Shove file in a temp directory since MacOS app bundles and iOS apps run sandboxed
const char* tempPath = getenv("TMPDIR"); const char* tempPath = getenv("TMPDIR");
// Fallback to /var/tmp if TMPDIR is not defined // Fallback to /var/tmp if TMPDIR is not defined