diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | ld_script_modern.txt | 1 |
2 files changed, 11 insertions, 6 deletions
@@ -41,9 +41,8 @@ override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex- LIBPATH := -L ../../tools/agbcc/lib else CC1 := $(shell $(CC) --print-prog-name=cc1) -quiet -override CFLAGS += -mthumb -mthumb-interwork -O2 -mtune=arm7tdmi -march=armv4t -mabi=apcs-gnu -fno-toplevel-reorder -fno-aggressive-loop-optimizations -Wno-pointer-to-int-cast -#LIBPATH := -L $(TOOLCHAIN)/lib/gcc/arm-none-eabi/$(GCC_VER)/thumb -L $(TOOLCHAIN)/arm-none-eabi/lib/thumb -LIBPATH := -L ../../tools/agbcc/lib +override CFLAGS += -mthumb -mthumb-interwork -O2 -mcpu=arm7tdmi -mabi=apcs-gnu -fno-toplevel-reorder -fno-aggressive-loop-optimizations -Wno-pointer-to-int-cast +LIBPATH := -L $(shell dirname $(shell $(CC) --print-file-name=libgcc.a)) -L $(shell dirname $(shell $(CC) --print-file-name=libc.a)) endif CPPFLAGS := -iquote include -D$(GAME_VERSION) -DREVISION=$(GAME_REVISION) -D$(GAME_LANGUAGE) -DMODERN=$(MODERN) @@ -77,9 +76,14 @@ ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_RE LDFLAGS = -Map ../../$(MAP) LIB := $(LIBPATH) -lc -lgcc -#ifneq ($(MODERN),0) -#LIB += -lsysbase -#endif +ifneq ($(MODERN),0) +ifneq ($(DEVKITARM),) +ifeq ($(TOOLCHAIN),$(DEVKITARM)) +LIB += -lsysbase -lc +endif +endif +LIB += -lnosys +endif SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c GFX := tools/gbagfx/gbagfx diff --git a/ld_script_modern.txt b/ld_script_modern.txt index 9f1508067..fc6c0d0b7 100644 --- a/ld_script_modern.txt +++ b/ld_script_modern.txt @@ -29,6 +29,7 @@ SECTIONS { /* COMMON starts at 0x30022A8 */ *(COMMON); end = .; + __end__ = .; . = 0x8000; } |