yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1209_ryanmkurtz_PR-3387_ryanmkurtz_native-release-builds--SQUASHED'
(Closes #3387)
This commit is contained in:
Ryan Kurtz 2021-09-27 08:35:10 -04:00
commit a1dba97a10
22 changed files with 541 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java
View file

@ -470,7 +470,7 @@ public class Application {
exactFilename);
}
// Allow win32 to be used for win64 as fallback
// Allow win_x86_32 to be used for win_x86_64 as fallback
if (file == null && Platform.CURRENT_PLATFORM == Platform.WIN_X86_64) {
file = getModuleFile(module, "build/os/" + Platform.WIN_X86_32.getDirectoryName(),
exactFilename);
@ -479,6 +479,16 @@ public class Application {
file = getModuleFile(module, "os/" + Platform.WIN_X86_32.getDirectoryName(),
exactFilename);
}
// Allow mac_x86_64 to be used for mac_arm_64 as fallback (requires macOS Rosetta 2)
if (file == null && Platform.CURRENT_PLATFORM == Platform.MAC_ARM_64) {
file = getModuleFile(module, "build/os/" + Platform.MAC_X86_64.getDirectoryName(),
exactFilename);
}
if (file == null && Platform.CURRENT_PLATFORM == Platform.MAC_ARM_64) {
file = getModuleFile(module, "os/" + Platform.MAC_X86_64.getDirectoryName(),
exactFilename);
}
if (file == null) {
throw new OSFileNotFoundException(moduleName, exactFilename);
@ -506,13 +516,21 @@ public class Application {
file = findModuleFile("os/" + Platform.CURRENT_PLATFORM.getDirectoryName(), path);
}
// Allow win32 to be used for win64 as fallback
// Allow win_x86_32 to be used for win_x86_64 as fallback
if (file == null && Platform.CURRENT_PLATFORM == Platform.WIN_X86_64) {
file = findModuleFile("build/os/" + Platform.WIN_X86_32.getDirectoryName(), path);
}
if (file == null && Platform.CURRENT_PLATFORM == Platform.WIN_X86_64) {
file = findModuleFile("os/" + Platform.WIN_X86_32.getDirectoryName(), path);
}
// Allow mac_x86_64 to be used for mac_arm_64 as fallback (requires macOS Rosetta 2)
if (file == null && Platform.CURRENT_PLATFORM == Platform.MAC_ARM_64) {
file = findModuleFile("build/os/" + Platform.MAC_X86_64.getDirectoryName(), path);
}
if (file == null && Platform.CURRENT_PLATFORM == Platform.MAC_ARM_64) {
file = findModuleFile("os/" + Platform.MAC_X86_64.getDirectoryName(), path);
}
if (file == null) {
throw new OSFileNotFoundException(path);