diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | INSTALL.md | 2 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | arm7/Makefile | 2 | ||||
| -rw-r--r-- | arm9/Makefile | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 4f376cea..867a5198 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ install: # These files are only accessible from Travis CI IP Addresses to prevent piracy. - wget http://private.martmists.com/mwccarm.zip - wget http://private.martmists.com/baserom.nds - - cp baserom.nds arm7/ - - cp baserom.nds arm9/ - unzip mwccarm.zip - mv mwccarm tools @@ -1,6 +1,6 @@ ### 1. Copy baserom(s) into root folder -Put clean copies of Pokemon Diamond (US) nds rom at `./baserom.nds`, `./arm9/baserom.nds`, and `./arm7/baserom.nds`. All three copies are required and must be identical. +Put a clean copy of Pokemon Diamond (US) nds rom at `./baserom.nds`. ### 2. Install MWCC compiler @@ -118,12 +118,18 @@ all: $(ROM) @$(SHA1SUM) -c $(TARGET).sha1 clean: mostlyclean + make -C arm9 clean + make -C arm7 clean make -C tools/mwasmarm_patcher clean mostlyclean: tidy + make -C arm9 mostlyclean + make -C arm7 mostlyclean find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} + tidy: + make -C arm9 tidy + make -C arm7 tidy $(RM) -r $(BUILD_DIR) tools: $(TOOLDIRS) diff --git a/arm7/Makefile b/arm7/Makefile index 88e81d5d..d2c2681d 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -79,7 +79,7 @@ OBJDUMP := $(CROSS)objdump OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm7_thumb.s -o arm7.o -ASFLAGS = -proc arm5te +ASFLAGS = -proc arm5te -i .. CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c99 -Cpp_exceptions off -ir ../include LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start diff --git a/arm9/Makefile b/arm9/Makefile index 5c6b4fda..d97cfb95 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -79,7 +79,7 @@ OBJDUMP := $(CROSS)objdump OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o -ASFLAGS = -proc arm5te +ASFLAGS = -proc arm5te -i .. CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c99 -Cpp_exceptions off -ir ../include LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start |