diff options
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | ld_script.txt | 104 | ||||
| -rw-r--r-- | sym_bss.txt | 6 |
4 files changed, 63 insertions, 61 deletions
diff --git a/INSTALL.md b/INSTALL.md index 5f7eecbd2..aa5b8f91a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -62,8 +62,10 @@ Run the Cygwin setup and leave the default settings. At "Select Packages", set t In the **Cygwin terminal**, enter these commands: + export DEVKITPRO=/cygdrive/c/devkitpro + echo export DEVKITPRO=$DEVKITPRO >> ~/.bashrc export DEVKITARM=/cygdrive/c/devkitpro/devkitARM - echo export DEVKITARM=/cygdrive/c/devkitpro/devkitARM >> ~/.bashrc + echo export DEVKITARM=$DEVKITARM >> ~/.bashrc git clone https://github.com/pret/pokeruby git clone https://github.com/pret/agbcc @@ -1,4 +1,4 @@ - +include $(DEVKITARM)/base_tools include config.mk ifeq ($(OS),Windows_NT) @@ -11,11 +11,11 @@ endif #### Tools #### SHELL := /bin/bash -o pipefail -AS := $(DEVKITARM)/bin/arm-none-eabi-as +AS := $(PREFIX)as CC1 := tools/agbcc/bin/agbcc$(EXE) -CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp -LD := $(DEVKITARM)/bin/arm-none-eabi-ld -OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy +CPP := $(PREFIX)cpp +LD := $(PREFIX)ld +OBJCOPY := $(PREFIX)objcopy SHA1SUM := sha1sum -c GBAGFX := tools/gbagfx/gbagfx$(EXE) RSFONT := tools/rsfont/rsfont$(EXE) diff --git a/ld_script.txt b/ld_script.txt index 869e61e5b..a9314d060 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -27,7 +27,7 @@ SECTIONS { /* COMMON starts at 0x3001760 */ INCLUDE "sym_common.ld" - tools/agbcc/lib/libc.a:sbrkr.o(COMMON); + *libc.a:sbrkr.o(COMMON); end = .; . = 0x8000; } @@ -414,54 +414,54 @@ SECTIONS { src/libs/agb_flash_mx.o(.text); src/libs/siirtc.o(.text); src/libs/libagbsyscall.o(.text); - tools/agbcc/lib/libgcc.a:_call_via_rX.o(.text); - tools/agbcc/lib/libgcc.a:_divsi3.o(.text); - tools/agbcc/lib/libgcc.a:_dvmd_tls.o(.text); - tools/agbcc/lib/libgcc.a:_fixunsdfsi.o(.text); - tools/agbcc/lib/libgcc.a:_fixunssfsi.o(.text); - tools/agbcc/lib/libgcc.a:_modsi3.o(.text); - tools/agbcc/lib/libgcc.a:_muldi3.o(.text); - tools/agbcc/lib/libgcc.a:_udivdi3.o(.text); - tools/agbcc/lib/libgcc.a:_udivsi3.o(.text); - tools/agbcc/lib/libgcc.a:_umodsi3.o(.text); - tools/agbcc/lib/libgcc.a:dp-bit.o(.text); - tools/agbcc/lib/libgcc.a:fp-bit.o(.text); - tools/agbcc/lib/libgcc.a:_lshrdi3.o(.text); - tools/agbcc/lib/libgcc.a:_negdi2.o(.text); - tools/agbcc/lib/libc.a:memcpy.o(.text); - tools/agbcc/lib/libc.a:memset.o(.text); - tools/agbcc/lib/libc.a:strcmp.o(.text); - tools/agbcc/lib/libc.a:vfprintf.o(.text); - tools/agbcc/lib/libc.a:vsprintf.o(.text); - tools/agbcc/lib/libc.a:fvwrite.o(.text); - tools/agbcc/lib/libc.a:locale.o(.text); - tools/agbcc/lib/libc.a:findfp.o(.text); - tools/agbcc/lib/libc.a:fflush.o(.text); - tools/agbcc/lib/libc.a:wsetup.o(.text); - tools/agbcc/lib/libc.a:mbtowc_r.o(.text); - tools/agbcc/lib/libc.a:s_isinf.o(.text); - tools/agbcc/lib/libc.a:s_isnan.o(.text); - tools/agbcc/lib/libc.a:memchr.o(.text); - tools/agbcc/lib/libc.a:strlen.o(.text); - tools/agbcc/lib/libc.a:dtoa.o(.text); - tools/agbcc/lib/libc.a:memmove.o(.text); - tools/agbcc/lib/libc.a:stdio.o(.text); - tools/agbcc/lib/libc.a:mprec.o(.text); - tools/agbcc/lib/libc.a:mallocr.o(.text); - tools/agbcc/lib/libc.a:fwalk.o(.text); - tools/agbcc/lib/libc.a:freer.o(.text); - tools/agbcc/lib/libc.a:makebuf.o(.text); - tools/agbcc/lib/libc.a:readr.o(.text); - tools/agbcc/lib/libc.a:writer.o(.text); - tools/agbcc/lib/libc.a:lseekr.o(.text); - tools/agbcc/lib/libc.a:closer.o(.text); - tools/agbcc/lib/libc.a:callocr.o(.text); - tools/agbcc/lib/libc.a:sbrkr.o(.text); - tools/agbcc/lib/libc.a:mlock.o(.text); - tools/agbcc/lib/libc.a:fstatr.o(.text); - tools/agbcc/lib/libc.a:libcfunc.o(.text); - tools/agbcc/lib/libc.a:syscalls.o(.text); - tools/agbcc/lib/libc.a:errno.o(.text); + *libgcc.a:_call_via_rX.o(.text); + *libgcc.a:_divsi3.o(.text); + *libgcc.a:_dvmd_tls.o(.text); + *libgcc.a:_fixunsdfsi.o(.text); + *libgcc.a:_fixunssfsi.o(.text); + *libgcc.a:_modsi3.o(.text); + *libgcc.a:_muldi3.o(.text); + *libgcc.a:_udivdi3.o(.text); + *libgcc.a:_udivsi3.o(.text); + *libgcc.a:_umodsi3.o(.text); + *libgcc.a:dp-bit.o(.text); + *libgcc.a:fp-bit.o(.text); + *libgcc.a:_lshrdi3.o(.text); + *libgcc.a:_negdi2.o(.text); + *libc.a:memcpy.o(.text); + *libc.a:memset.o(.text); + *libc.a:strcmp.o(.text); + *libc.a:vfprintf.o(.text); + *libc.a:vsprintf.o(.text); + *libc.a:fvwrite.o(.text); + *libc.a:locale.o(.text); + *libc.a:findfp.o(.text); + *libc.a:fflush.o(.text); + *libc.a:wsetup.o(.text); + *libc.a:mbtowc_r.o(.text); + *libc.a:s_isinf.o(.text); + *libc.a:s_isnan.o(.text); + *libc.a:memchr.o(.text); + *libc.a:strlen.o(.text); + *libc.a:dtoa.o(.text); + *libc.a:memmove.o(.text); + *libc.a:stdio.o(.text); + *libc.a:mprec.o(.text); + *libc.a:mallocr.o(.text); + *libc.a:fwalk.o(.text); + *libc.a:freer.o(.text); + *libc.a:makebuf.o(.text); + *libc.a:readr.o(.text); + *libc.a:writer.o(.text); + *libc.a:lseekr.o(.text); + *libc.a:closer.o(.text); + *libc.a:callocr.o(.text); + *libc.a:sbrkr.o(.text); + *libc.a:mlock.o(.text); + *libc.a:fstatr.o(.text); + *libc.a:libcfunc.o(.text); + *libc.a:syscalls.o(.text); + *libc.a:errno.o(.text); src/libs/libisagbprn.o(.text); } =0 @@ -1203,9 +1203,9 @@ SECTIONS { src/libs/agb_flash_mx.o(.rodata); src/libs/agb_flash_le.o(.rodata); src/libs/siirtc.o(.rodata); - tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata); - tools/agbcc/lib/libc.a(.rodata); - tools/agbcc/lib/libc.a(.data); + *libgcc.a:_udivdi3.o(.rodata); + *libc.a(.rodata); + *libc.a(.data); src/libs/libisagbprn.o(.rodata); } =0 diff --git a/sym_bss.txt b/sym_bss.txt index 01f690085..d2e3e91ce 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -48,6 +48,6 @@ unk_debug_bss_3 = .; . = ALIGN(4); src/libs/m4a_1.o(.bss); . = ALIGN(4); src/libs/agb_flash.o(.bss); . = ALIGN(4); src/libs/siirtc.o(.bss); -. = ALIGN(4); tools/agbcc/lib/libgcc.a:dp-bit.o(.bss); -. = ALIGN(4); tools/agbcc/lib/libgcc.a:fp-bit.o(.bss); -. = ALIGN(4); tools/agbcc/lib/libc.a:syscalls.o(.bss); +. = ALIGN(4); *libgcc.a:dp-bit.o(.bss); +. = ALIGN(4); *libgcc.a:fp-bit.o(.bss); +. = ALIGN(4); *libc.a:syscalls.o(.bss); |