diff options
| author | Demki <mordbz@gmail.com> | 2020-05-01 09:08:03 +0300 |
|---|---|---|
| committer | Demki <mordbz@gmail.com> | 2020-05-01 09:08:03 +0300 |
| commit | 4c5341831c0af7573552629a76b9ef5baadc81a9 (patch) | |
| tree | 7e0a565279d62cadd4bf8bef08db9b4bdcf5da51 /arm7 | |
| parent | 081bd6efce613ed078407ab8fd24765275385f9f (diff) | |
add thumb/arm macros and change makefiles to reflect that.
and decompilation of FUN_020910A4.c
Diffstat (limited to 'arm7')
| -rw-r--r-- | arm7/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm7/Makefile b/arm7/Makefile index cdbb27d7..6be0f66a 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -58,32 +58,32 @@ O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \ ##################### Compiler Options ####################### -MWCCVERSION := 2.0/base +MWCCVERSION = 2.0/base TOOLS_DIR = ../tools CROSS := arm-none-eabi- -MWCCARM := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwccarm.exe +MWCCARM = $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwccarm.exe # Argh... due to EABI version shenanigans, we can't use GNU LD to link together # MWCC built objects and GNU built ones. mwldarm, however, doesn't care, so we # have to use mwldarm for now. # TODO: Is there a hack workaround to let us go back to GNU LD? Ideally, the # only dependency should be MWCCARM. -MWLDARM := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwldarm.exe -MWASMARM := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwasmarm.exe +MWLDARM = $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwldarm.exe +MWASMARM = $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwasmarm.exe MAKELSF := $(WINE) $(TOOLS_DIR)/bin/makelcf.exe -AS := $(WINE) $(MWASMARM) -CC := $(WINE) $(MWCCARM) +AS = $(WINE) $(MWASMARM) +CC = $(WINE) $(MWCCARM) CPP := cpp -P -LD := $(WINE) $(MWLDARM) +LD = $(WINE) $(MWLDARM) AR := $(CROSS)ar OBJDUMP := $(CROSS)objdump OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm7_thumb.s -o arm7.o ASFLAGS = -proc arm4t -i .. -CFLAGS = -O4,p -proc v4t -thumb -fp soft -lang c99 -Cpp_exceptions off -ir ../include +CFLAGS = -O4,p -proc v4t -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw LDFLAGS = -map -nodead -w off -proc v4t -interworking -map -symtab -m _start ####################### Other Tools ######################### |