diff --git a/.gitignore b/.gitignore index ec90d25f..e070b708 100644 --- a/.gitignore +++ b/.gitignore @@ -29,5 +29,4 @@ perf.mData.old .gdb_history .DS_Store -tools/aarch64-none-elf-objdump toolchain/clang/ diff --git a/tools/aarch64-none-elf-objdump b/tools/aarch64-none-elf-objdump deleted file mode 100755 index 8919ccdd..00000000 Binary files a/tools/aarch64-none-elf-objdump and /dev/null differ diff --git a/tools/diff_settings.py b/tools/diff_settings.py index 569bb218..d5f48269 100644 --- a/tools/diff_settings.py +++ b/tools/diff_settings.py @@ -1,4 +1,18 @@ from pathlib import Path +import platform + + +ROOT = Path(__file__).resolve().parent.parent + + +def get_tools_bin_dir(): + path = ROOT / 'tools' / 'nx-decomp-tools-binaries' + system = platform.system() + if system == "Linux": + return str(path) + "/linux/" + if system == "Darwin": + return str(path) + "/macos/" + return "" def apply(config, args): @@ -6,7 +20,7 @@ def apply(config, args): config['baseimg'] = 'data/main.elf' config['myimg'] = 'build/uking' config['source_directories'] = ['src', 'lib'] - config['objdump_executable'] = 'tools/aarch64-none-elf-objdump' + config['objdump_executable'] = get_tools_bin_dir() + 'aarch64-none-elf-objdump' for dir in ('build', 'build/nx64-release'): if (Path(dir) / 'build.ninja').is_file():