mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-30 19:24:23 +01:00
Excluding Android from multiple-instance feature because i'm too lazy to learn ashmem :D
This commit is contained in:
1 parent
a35acdee43
commit
46ebdebe05
2 files changed
+10
-3
No files matched your search
@@ -22,9 +22,7 @@
|
||||
// All credit goes to him!
|
||||
|
||||
#if !defined(_WIN32)
|
||||
#include <netdb.h>
|
||||
#include <unistd.h>
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#include <cstring>
|
||||
|
||||
+10
-1
@@ -20,7 +20,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
#include <fcntl.h>
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#include "net/resolve.h"
|
||||
@@ -113,6 +112,9 @@ static uint8_t getInstanceNumber() {
|
||||
//hIDMapFile = NULL;
|
||||
|
||||
return id;
|
||||
#elif __ANDROID__
|
||||
// TODO : replace shm_open & shm_unlink with ashmem or android-shmem
|
||||
return 1;
|
||||
#elif __linux__ || __APPLE__
|
||||
long BUF_SIZE = 4096;
|
||||
//caddr_t pIDBuf;
|
||||
@@ -158,6 +160,13 @@ static void PPSSPPIDCleanup() {
|
||||
CloseHandle(hIDMapFile); // If program exited(or crashed?) or the last handle reference closed the shared memory object will be deleted.
|
||||
hIDMapFile = NULL;
|
||||
}
|
||||
#elif __ANDROID__
|
||||
if (hIDMapFile != 0) {
|
||||
close(hIDMapFile);
|
||||
// TODO : replace shm_unlink with ashmem or android-shmem
|
||||
//shm_unlink(ID_SHM_NAME); // If program exited or crashed before unlinked the shared memory object and it's contents will persist.
|
||||
hIDMapFile = 0;
|
||||
}
|
||||
#elif __linux__ || __APPLE__
|
||||
// TODO : This unlink should be called when program exits instead of everytime the game reset.
|
||||
if (hIDMapFile != 0) {
|
||||
|
||||
Reference in new issue
Block a user