diff --git a/buildnumber.txt b/buildnumber.txt index 3215a975..92c15ec1 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2653 \ No newline at end of file +2654 \ No newline at end of file diff --git a/source/funkin/system/framerate/SystemInfo.hx b/source/funkin/system/framerate/SystemInfo.hx index e739bb3b..1ac8efbd 100644 --- a/source/funkin/system/framerate/SystemInfo.hx +++ b/source/funkin/system/framerate/SystemInfo.hx @@ -17,10 +17,20 @@ class SystemInfo extends FramerateCategory { #if windows var process = new sys.io.Process("wmic", ["cpu", "get", "name"]); - if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split("\n")[1]; - #elseif (mac || linux) + if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split("\n")[1].trim(); + #elseif (mac) var process = new sys.io.Process("sysctl -a | grep brand"); - if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split(":")[1]; + if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split(":")[1].trim(); + #else + var process = new sys.io.Process("cat", ["/proc/cpuinfo"]); + if (process.exitCode() != 0) return; + + for (line in process.stdout.readAll().toString().split("\n")) { + if (line.indexOf("model name") == 0) { + cpuName = line.substring(line.indexOf(":") + 2); + break; + } + } #end } @@ -34,7 +44,7 @@ class SystemInfo extends FramerateCategory { _text += '\nCPU: ${cpuName} ${openfl.system.Capabilities.cpuArchitecture} ${(openfl.system.Capabilities.supports64BitProcesses ? '64-Bit' : '32-Bit')}'; _text += '\nGPU: ${gpuName} | VRAM $vRAM'; _text += '\nGarbage Collector: ${MemoryUtil.disableCount > 0 ? "OFF" : "ON"} (${MemoryUtil.disableCount})'; - + this.text.text = _text; super.__enterFrame(t); }