The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-11-10 21:05:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Gamecube/Wii] modified Makefiles to directly use bin2s tool instead of bin2o script (fixes build issues with latest devkitPPC releases producing refactored/incompatible bin2s tool outputs)

Browse Source
This commit is contained in:
ekeeke 2020-09-18 01:44:14 +02:00
parent a8d15733fb
commit 54b946cd55
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.gc
View File

@ -20,8 +20,7 @@ BUILD := build_cube
SOURCES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \ SOURCES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \
gx gx/utils gx/gui gx/fileio gx/images gx/sounds gx gx/utils gx/gui gx/fileio gx/images gx/sounds
INCLUDES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \ INCLUDES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \
gx gx/utils gx/gui gx/fileio gx/images gx/sounds \ gx gx/utils gx/gui gx/fileio gx/images gx/sounds
$(BUILD)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
@ -127,19 +126,20 @@ $(OUTPUT).elf: $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.jpg.o : %.jpg %.jpg.o : %.jpg
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
%.png.o : %.png %.png.o : %.png
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
%.pcm.o : %.pcm %.pcm.o : %.pcm
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
%.ogg.o : %.ogg %.ogg.o : %.ogg
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
-include $(DEPENDS) -include $(DEPENDS)

11
Makefile.wii
View File

@ -24,8 +24,7 @@ SOURCES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_
gx gx/utils gx/utils/wiidrc gx/gui gx/fileio gx/images gx/sounds gx gx/utils gx/utils/wiidrc gx/gui gx/fileio gx/images gx/sounds
INCLUDES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \ INCLUDES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \
$(CHDLIBDIR)/src $(CHDLIBDIR)/deps/libFLAC/include $(CHDLIBDIR)/deps/lzma \ $(CHDLIBDIR)/src $(CHDLIBDIR)/deps/libFLAC/include $(CHDLIBDIR)/deps/lzma \
gx gx/utils gx/utils/wiidrc gx/gui gx/fileio gx/images gx/sounds \ gx gx/utils gx/utils/wiidrc gx/gui gx/fileio gx/images gx/sounds
$(BUILD)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
@ -131,19 +130,19 @@ $(OUTPUT).elf: $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.jpg.o : %.jpg %.jpg.o : %.jpg
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
%.png.o : %.png %.png.o : %.png
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
%.pcm.o : %.pcm %.pcm.o : %.pcm
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
%.ogg.o : %.ogg %.ogg.o : %.ogg
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) bin2s -a 32 $< | $(AS) -o $(@)
-include $(DEPENDS) -include $(DEPENDS)