Raspberry Pi fixes (thanks @gepatto)
This commit is contained in:
@@ -44,12 +44,19 @@ class PlatformHelper {
|
||||
process.exitCode ();
|
||||
process.close ();
|
||||
|
||||
if (output.indexOf ("64") > -1) {
|
||||
if (output.indexOf ("armv6") > -1) {
|
||||
|
||||
_hostArchitecture = Architecture.ARMV6;
|
||||
|
||||
} else if (output.indexOf ("armv7") > -1) {
|
||||
|
||||
_hostArchitecture = Architecture.ARMV7;
|
||||
|
||||
} else if (output.indexOf ("64") > -1) {
|
||||
|
||||
_hostArchitecture = Architecture.X64;
|
||||
|
||||
} else {
|
||||
|
||||
_hostArchitecture = Architecture.X86;
|
||||
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ class LinuxPlatform extends PlatformTarget {
|
||||
if (project.targetFlags.exists ("rpi")) {
|
||||
|
||||
isRaspberryPi = true;
|
||||
is64 = true;
|
||||
is64 = false;
|
||||
|
||||
} else if (PlatformHelper.hostPlatform == Platform.LINUX) {
|
||||
|
||||
|
||||
@@ -456,7 +456,7 @@ class CommandLineTools {
|
||||
|
||||
}
|
||||
|
||||
if (raspberryPi) {
|
||||
if (raspberryPi || PlatformHelper.hostArchitecture == Architecture.ARMV6 || PlatformHelper.hostArchitecture == Architecture.ARMV7) {
|
||||
|
||||
untyped $loader.path = $array (path + "RPi/", $loader.path);
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ class RunScript {
|
||||
|
||||
case "Linux":
|
||||
|
||||
if (PlatformHelper.hostPlatform == LINUX && PlatformHelper.hostArchitecture == X86) {
|
||||
if (PlatformHelper.hostPlatform == LINUX && PlatformHelper.hostArchitecture != X64) {
|
||||
|
||||
ProcessHelper.runCommand (limeDirectory, "neko", args.concat ([ "linux", "-32", toolsDirectory ]));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user