treewide: update project to BlocksDS v1.0.0

- Updated Makefiles
DS-Homebrew · May 12, 2024 · c6b153e · c6b153e
1 parent 6bd0f24
commit c6b153e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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