From aa57efe66cdd30a78e135316c2057264e59ddd75 Mon Sep 17 00:00:00 2001
From: niansa <niansa@lyllia>
Date: Fri, 5 Jun 2020 16:22:50 +0200
Subject: [PATCH] Fixed .elf file conflicts

---
 Makefile-3ds | 6 +++---
 Makefile-nds | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile-3ds b/Makefile-3ds
index 10e05e6..c7f7049 100644
--- a/Makefile-3ds
+++ b/Makefile-3ds
@@ -180,7 +180,7 @@ endif
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(GFXBUILD)
+	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET)-3ds.elf $(GFXBUILD)
 
 #---------------------------------------------------------------------------------
 $(GFXBUILD)/%.t3x	$(BUILD)/%.h	:	%.t3s
@@ -194,11 +194,11 @@ else
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
-$(OUTPUT).3dsx	:	$(OUTPUT).elf $(_3DSXDEPS)
+$(OUTPUT).3dsx	:	$(OUTPUT)-3ds.elf $(_3DSXDEPS)
 
 $(OFILES_SOURCES) : $(HFILES)
 
-$(OUTPUT).elf	:	$(OFILES)
+$(OUTPUT)-3ds.elf	:	$(OFILES)
 
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
diff --git a/Makefile-nds b/Makefile-nds
index 64e10c7..18b9c6a 100644
--- a/Makefile-nds
+++ b/Makefile-nds
@@ -114,7 +114,7 @@ $(BUILD):
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -rf $(BUILD) $(TARGET).elf $(TARGET).nds $(TARGET).ds.gba 
+	@rm -rf $(BUILD) $(TARGET)-nds.elf $(TARGET).nds $(TARGET).ds.gba 
  
  
 #---------------------------------------------------------------------------------
@@ -125,8 +125,8 @@ DEPENDS	:=	$(OFILES:.o=.d)
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
-$(OUTPUT).nds	: 	$(OUTPUT).elf
-$(OUTPUT).elf	:	$(OFILES)
+$(OUTPUT).nds	: 	$(OUTPUT)-nds.elf
+$(OUTPUT)-nds.elf	:	$(OFILES)
  
  
 #---------------------------------------------------------------------------------