GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 01:57:39 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1154 updates JMBE creator to work correctly with arm32 and aarch64 architectures.

Browse Source
This commit is contained in:
Dennis Sheirer
2022-03-06 07:30:48 -05:00
parent 54e4771f36
commit 0e8c9591e4
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/io/github/dsheirer/util/OSType.java
View File

@@ -73,15 +73,15 @@ public enum OSType
if(os.contains("win")) if(os.contains("win"))
{ {
if(arch.contains("x86") && arch.contains("64")) if(arch.contains("amd64"))
{ {
return OSType.WINDOWS_X86_64; return OSType.WINDOWS_X86_64;
} }
else if(arch.contains("x86") && arch.contains("32")) else if(arch.contains("x86"))
{ {
return OSType.WINDOWS_X86_32; return OSType.WINDOWS_X86_32;
} }
else if(arch.contains("aarch") && arch.contains("64")) else if(arch.contains("aarch64"))
{ {
return OSType.WINDOWS_AARCH_64; return OSType.WINDOWS_AARCH_64;
} }
@@ -89,11 +89,11 @@ public enum OSType
if(os.contains("mac") || os.contains("darwin") || os.contains("osx")) if(os.contains("mac") || os.contains("darwin") || os.contains("osx"))
{ {
if(arch.contains("x86") && arch.contains("64")) if(arch.contains("amd64"))
{ {
return OSType.OSX_X86_64; return OSType.OSX_X86_64;
} }
else if(arch.contains("aarch") && arch.contains("64")) else if(arch.contains("aarch64"))
{ {
return OSType.OSX_AARCH_64; return OSType.OSX_AARCH_64;
} }
@@ -101,15 +101,15 @@ public enum OSType
if(os.contains("nux") || os.contains("nix") || os.contains("aix")) if(os.contains("nux") || os.contains("nix") || os.contains("aix"))
{ {
if(arch.contains("x86") && arch.contains("64")) if(arch.contains("amd64"))
{ {
return OSType.LINUX_X86_64; return OSType.LINUX_X86_64;
} }
else if(arch.contains("x86") && arch.contains("32")) else if(arch.contains("x86"))
{ {
return OSType.LINUX_X86_32; return OSType.LINUX_X86_32;
} }
else if(arch.contains("aarch") && arch.contains("64")) else if(arch.contains("aarch64"))
{ {
return OSType.LINUX_AARCH_64; return OSType.LINUX_AARCH_64;
} }
@@ -121,5 +121,4 @@ public enum OSType
return OSType.UNKNOWN; return OSType.UNKNOWN;
} }
} }