summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-01-29 11:03:26 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-01-29 11:03:26 -0600
commit8dbab51c0e30c1cd590fd549324eaa54b45224a6 (patch)
treec94b002f91bcbcbbe696d3a8ba3797d1e29652ef
parent10037ac0e1c1737dc7cb309257369b17ccd5e028 (diff)
parent097da4e0112275a25b99160f5bc409a51f3a13d7 (diff)
Merge remote-tracking branch 'Pikalax/libc'
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b9e2fb289..c38d8fe76 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,11 @@ LDFLAGS = -Map ../../$(MAP)
OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
-LIBGCC := tools/agbcc/lib/libgcc.a
-LIBC := tools/agbcc/lib/libc.a
+ifeq ($(OS),Windows_NT)
+ LIB := ../../tools/agbcc/lib/libgcc.a ../../tools/agbcc/lib/libc.a
+else
+ LIB := -L ../../tools/agbcc/lib -lgcc -lc
+endif
SHA1 := sha1sum -c
@@ -163,7 +166,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm
cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
- cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC)
+ cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
$(ROM): $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@