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

Fixes for Linux (#124)

Browse Source 
* Throw an exception instead

* Change all compiler targets to follow OS, not Windows
This commit is contained in:
Fireable
2023-05-16 00:16:51 +02:00
committed by GitHub
parent e6e96dc6a9
commit 46a26212b0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commandline/commands/Compiler.hx
+3 -3
View File
@@ -5,13 +5,13 @@ class Compiler {
__build(args, ["test", getBuildTarget(), "-D", "TEST_BUILD"]); __build(args, ["test", getBuildTarget(), "-D", "TEST_BUILD"]);
} }
public static function build(args:Array<String>) { public static function build(args:Array<String>) {
__build(args, ["build", "windows", "-D", "TEST_BUILD"]); __build(args, ["build", getBuildTarget(), "-D", "TEST_BUILD"]);
} }
public static function release(args:Array<String>) { public static function release(args:Array<String>) {
__build(args, ["build", "windows"]); __build(args, ["build", getBuildTarget()]);
} }
public static function testRelease(args:Array<String>) { public static function testRelease(args:Array<String>) {
__build(args, ["test", "windows"]); __build(args, ["test", getBuildTarget()]);
} }
private static function __build(args:Array<String>, arg:Array<String>) { private static function __build(args:Array<String>, arg:Array<String>) {
source/funkin/backend/system/framerate/SystemInfo.hx
+1 -1
View File
@@ -31,7 +31,7 @@ class SystemInfo extends FramerateCategory {
if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split(":")[1].trim(); if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split(":")[1].trim();
#elseif linux #elseif linux
var process = new HiddenProcess("cat", ["/proc/cpuinfo"]); var process = new HiddenProcess("cat", ["/proc/cpuinfo"]);
if (process.exitCode() != 0) return; if (process.exitCode() != 0) throw 'Could not fetch CPU information';
for (line in process.stdout.readAll().toString().split("\n")) { for (line in process.stdout.readAll().toString().split("\n")) {
if (line.indexOf("model name") == 0) { if (line.indexOf("model name") == 0) {
source/funkin/backend/utils/MemoryUtil.hx
+1 -1
View File
@@ -128,7 +128,7 @@ class MemoryUtil {
reg.match(process.stdout.readAll().toString()); reg.match(process.stdout.readAll().toString());
if (process.exitCode() == 0) return reg.matched(1); if (process.exitCode() == 0) return reg.matched(1);
#elseif linux #elseif linux
var process = HiddenProcess("sudo", ["dmidecode", "--type", "17"]); var process = new HiddenProcess("sudo", ["dmidecode", "--type", "17"]);
if (process.exitCode() != 0) return "Unknown"; if (process.exitCode() != 0) return "Unknown";
var lines = process.stdout.readAll().toString().split("\n"); var lines = process.stdout.readAll().toString().split("\n");
for (line in lines) { for (line in lines) {