mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 19:24:16 +01:00
Fix asmdiff.sh to work without DKP, also improve the makefile command for recognizing a toolchain.
The new command requires the toolchain binary path to exist in the file system before building using a toolchain (to handle the case where gba-dev is uninstalled but $(DEVKITARM) still exists))
This commit is contained in:
parent
4ecbb91ccb
commit
aad94c3433
2
Makefile
2
Makefile
@ -8,7 +8,7 @@ COMPARE ?= 0
|
||||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq ($(TOOLCHAIN),)
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
|
||||
|
@ -1,6 +1,11 @@
|
||||
#!/bin/bash
|
||||
|
||||
OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
|
||||
if [[ -d "$DEVKITARM/bin/" ]]; then
|
||||
OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
|
||||
else
|
||||
OBJDUMP_BIN="arm-none-eabi-objdump"
|
||||
fi
|
||||
OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
|
||||
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
|
||||
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
|
||||
$OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
|
||||
|
@ -8,7 +8,7 @@ COMPARE ?= 0
|
||||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq ($(TOOLCHAIN),)
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
|
||||
|
@ -8,7 +8,7 @@ COMPARE ?= 0
|
||||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq ($(TOOLCHAIN),)
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
|
||||
|
@ -8,7 +8,7 @@ COMPARE ?= 0
|
||||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq ($(TOOLCHAIN),)
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user