Skip to content

Commit 46a2621

Browse files
authored
Fixes for Linux (#124)
* Throw an exception instead * Change all compiler targets to follow OS, not Windows
1 parent e6e96dc commit 46a2621

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

commandline/commands/Compiler.hx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ class Compiler {
55
__build(args, ["test", getBuildTarget(), "-D", "TEST_BUILD"]);
66
}
77
public static function build(args:Array<String>) {
8-
__build(args, ["build", "windows", "-D", "TEST_BUILD"]);
8+
__build(args, ["build", getBuildTarget(), "-D", "TEST_BUILD"]);
99
}
1010
public static function release(args:Array<String>) {
11-
__build(args, ["build", "windows"]);
11+
__build(args, ["build", getBuildTarget()]);
1212
}
1313
public static function testRelease(args:Array<String>) {
14-
__build(args, ["test", "windows"]);
14+
__build(args, ["test", getBuildTarget()]);
1515
}
1616

1717
private static function __build(args:Array<String>, arg:Array<String>) {

source/funkin/backend/system/framerate/SystemInfo.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class SystemInfo extends FramerateCategory {
3131
if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split(":")[1].trim();
3232
#elseif linux
3333
var process = new HiddenProcess("cat", ["/proc/cpuinfo"]);
34-
if (process.exitCode() != 0) return;
34+
if (process.exitCode() != 0) throw 'Could not fetch CPU information';
3535

3636
for (line in process.stdout.readAll().toString().split("\n")) {
3737
if (line.indexOf("model name") == 0) {

source/funkin/backend/utils/MemoryUtil.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class MemoryUtil {
128128
reg.match(process.stdout.readAll().toString());
129129
if (process.exitCode() == 0) return reg.matched(1);
130130
#elseif linux
131-
var process = HiddenProcess("sudo", ["dmidecode", "--type", "17"]);
131+
var process = new HiddenProcess("sudo", ["dmidecode", "--type", "17"]);
132132
if (process.exitCode() != 0) return "Unknown";
133133
var lines = process.stdout.readAll().toString().split("\n");
134134
for (line in lines) {

0 commit comments

Comments
 (0)