From c6b153e072e385c9fecc0bf8725142f8ccd02353 Mon Sep 17 00:00:00 2001
From: lifehackerhansol <lifehackerhansol@ds-homebrew.com>
Date: Sat, 11 May 2024 20:20:40 -0700
Subject: [PATCH] treewide: update project to BlocksDS v1.0.0

- Updated Makefiles
---
 Makefile.arm7 | 3 +--
 Makefile.arm9 | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.arm7 b/Makefile.arm7
index f021d39..8c343aa 100644
--- a/Makefile.arm7
+++ b/Makefile.arm7
@@ -41,6 +41,7 @@ MAP		:= build/$(NAME).map
 PREFIX		:= $(ARM_NONE_EABI_PATH)arm-none-eabi-
 CC		:= $(PREFIX)gcc
 CXX		:= $(PREFIX)g++
+LD		:= $(PREFIX)gcc
 OBJDUMP		:= $(PREFIX)objdump
 MKDIR		:= mkdir
 RM		:= rm -rf
@@ -76,10 +77,8 @@ SPECS		:= $(BLOCKSDS)/sys/crts/ds_arm7.specs
 WARNFLAGS	:= -Wall
 
 ifeq ($(SOURCES_CPP),)
-	LD	:= $(CC)
 	LIBS	+= -lc
 else
-	LD	:= $(CXX)
 	LIBS	+= -lstdc++ -lc
 endif
 
diff --git a/Makefile.arm9 b/Makefile.arm9
index 443f8b2..9069425 100644
--- a/Makefile.arm9
+++ b/Makefile.arm9
@@ -44,6 +44,7 @@ SOUNDBANKDIR	:= $(BUILDDIR)/maxmod
 PREFIX		:= $(ARM_NONE_EABI_PATH)arm-none-eabi-
 CC		:= $(PREFIX)gcc
 CXX		:= $(PREFIX)g++
+LD		:= $(PREFIX)gcc
 OBJDUMP		:= $(PREFIX)objdump
 MKDIR		:= mkdir
 RM		:= rm -rf
@@ -89,10 +90,8 @@ SPECS		:= $(BLOCKSDS)/sys/crts/ds_arm9.specs
 WARNFLAGS	:= -Wall
 
 ifeq ($(SOURCES_CPP),)
-	LD	:= $(CC)
 	LIBS	+= -lc
 else
-	LD	:= $(CXX)
 	LIBS	+= -lstdc++ -lc
 endif