diff options
| author | Made-s <made111@gmx.de> | 2020-05-04 17:15:10 +0200 |
|---|---|---|
| committer | Made-s <made111@gmx.de> | 2020-05-04 17:15:10 +0200 |
| commit | 88d142a33b9973f35c913b3fdad7f6a4394a05cd (patch) | |
| tree | c6ad861213ccebb62919e27f6d7f3f1080e1ee76 /arm7 | |
| parent | ab28b0b37f2fd9fba6010e48e15bd31170d678d7 (diff) | |
| parent | c82690dca094b624944b155e5119631c185bca5c (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond
Diffstat (limited to 'arm7')
| -rw-r--r-- | arm7/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arm7/Makefile b/arm7/Makefile index 6be0f66a..c2a518a5 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -83,7 +83,7 @@ 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 -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw +CFLAGS = -O4,p -proc v4t -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw -ir ../arm9/lib/include # temporary fix while arm7 libos hasn't been decomped LDFLAGS = -map -nodead -w off -proc v4t -interworking -map -symtab -m _start ####################### Other Tools ######################### |