niansa/pilang2
1
0
Fork 0
mirror of https://gitlab.com/niansa/pilang2.git synced 2025-03-06 20:49:22 +01:00
Code Releases Activity

Fixed .elf file conflicts

Browse source
This commit is contained in:
niansa 2020-06-05 16:22:50 +02:00
parent 4cade7916f
commit aa57efe66c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile-3ds
View file

@ -180,7 +180,7 @@ endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@echo 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 $(GFXBUILD)/%.t3x $(BUILD)/%.h : %.t3s
@ -194,11 +194,11 @@ else
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
$(OUTPUT).3dsx : $(OUTPUT).elf $(_3DSXDEPS) $(OUTPUT).3dsx : $(OUTPUT)-3ds.elf $(_3DSXDEPS)
$(OFILES_SOURCES) : $(HFILES) $(OFILES_SOURCES) : $(HFILES)
$(OUTPUT).elf : $(OFILES) $(OUTPUT)-3ds.elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# you need a rule like this for each extension you use as binary data # you need a rule like this for each extension you use as binary data

6
Makefile-nds
View file

@ -114,7 +114,7 @@ $(BUILD):
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@echo 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 # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
$(OUTPUT).nds : $(OUTPUT).elf $(OUTPUT).nds : $(OUTPUT)-nds.elf
$(OUTPUT).elf : $(OFILES) $(OUTPUT)-nds.elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------