gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compiling on mac

Browse Source
This commit is contained in:
NeeEoo
2023-03-24 01:30:29 +01:00
parent 9132120608
commit 97791b36dc
2 changed files with 49 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/utils/MemoryUtil.hx
+48 -42
View File
@@ -12,53 +12,20 @@ import neko.vm.Gc;
#end
import openfl.system.System;
using StringTools;
#if cpp
@:cppFileCode("
#if defined(HX_WINDOWS)
#include <windows.h>
long long totalMem() {
unsigned long long allocatedRAM = 0;
GetPhysicallyInstalledSystemMemory(&allocatedRAM);
return (allocatedRAM / 1024);
}
#include <windows.h>
#endif
#if define(HX_MAC)
#include <stdio.h>
long long totalMem() {
int mib [] = { CTL_HW, HW_MEMSIZE };
int64_t value = 0;
size_t length = sizeof(value);
if(-1 == sysctl(mib, 2, &value, &length, NULL, 0))
return -1; // An error occurred
return value / 1024 / 1024;
}
#if defined(HX_MAC)
#include <stdio.h>
#endif
#if defined(HX_LINUX)
#include <sys/sysctl.h>
long long totalMem() {
FILE *meminfo = fopen('/proc/meminfo', 'r');
if(meminfo == NULL) return -1;
char line[256];
while(fgets(line, sizeof(line), meminfo))
{
int ram;
if(sscanf(line, 'MemTotal: %d kB', &ram) == 1)
{
fclose(meminfo);
return (ram / 1024);
}
}
fclose(meminfo);
return -1;
}
#include <sys/sysctl.h>
#endif
")
#end
@@ -112,7 +79,44 @@ class MemoryUtil {
}
#if cpp
@:functionCode("return totalMem();")
@:functionCode("
#if defined(HX_WINDOWS)
unsigned long long allocatedRAM = 0;
GetPhysicallyInstalledSystemMemory(&allocatedRAM);
return (allocatedRAM / 1024);
#endif
#if defined(HX_MAC)
int mib [] = { CTL_HW, HW_MEMSIZE };
int64_t value = 0;
size_t length = sizeof(value);
if(-1 == sysctl(mib, 2, &value, &length, NULL, 0))
return -1; // An error occurred
return value / 1024 / 1024;
#endif
#if defined(HX_LINUX)
FILE *meminfo = fopen('/proc/meminfo', 'r');
if(meminfo == NULL) return -1;
char line[256];
while(fgets(line, sizeof(line), meminfo))
{
int ram;
if(sscanf(line, 'MemTotal: %d kB', &ram) == 1)
{
fclose(meminfo);
return (ram / 1024);
}
}
fclose(meminfo);
return -1;
#endif
")
public static function getTotalMem():Float
{
return 0;
@@ -167,7 +171,9 @@ class MemoryUtil {
if (memoryOutput != -1) return memoryMap[memoryOutput];
#elseif mac
var process = new HiddenProcess("system_profiler", ["SPMemoryDataType"]);
if (process.exitCode() == 0) return process.stdout.readAll().toString().match(/Type: (.+)/)[1];
var reg = ~/Type: (.+)/;
reg.match(process.stdout.readAll().toString());
if (process.exitCode() == 0) return reg.matched(1);
#elseif linux
var process = HiddenProcess("sudo", ["dmidecode", "--type", "17"]);
if (process.exitCode() != 0) return "Unknown";