From 64f887cea311ad57bcc1ab6cd809c2275a01256b Mon Sep 17 00:00:00 2001
From: retro100 <retro100@dummy.local>
Date: Thu, 22 Apr 2021 15:30:02 +0200
Subject: [PATCH] fix2: Update Makefile for using auto generated headerfiles
 from bin2o in filelist.h.

---
 Makefile                    | 38 +++++++--------
 src/platform/wii/filelist.h | 92 +++++++++++++------------------------
 2 files changed, 50 insertions(+), 80 deletions(-)

diff --git a/Makefile b/Makefile
index b0aee03..86473be 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,6 @@ endif
 
 include $(DEVKITPPC)/wii_rules
 
-# override the bin2o definition for disable header creation
-define bin2o
-	bin2s -a 32 $< | $(AS) -o $(<F).o
-endef
-
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
 # BUILD is the directory where object files & intermediate files will be placed
@@ -71,10 +66,9 @@ CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
 CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
 sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-TTFFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ttf)))
-PNGFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.png)))
-OGGFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ogg)))
-PCMFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pcm)))
+BINFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ttf) \
+					$(wildcard $(dir)/*.lang) $(wildcard $(dir)/*.png) \
+					$(wildcard $(dir)/*.ogg) $(wildcard $(dir)/*.pcm)))
 
 #---------------------------------------------------------------------------------
 # use CXX for linking C++ projects, CC for standard C
@@ -85,10 +79,11 @@ else
 	export LD	:=	$(CXX)
 endif
 
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(TTFFILES:.ttf=.ttf.o) $(PNGFILES:.png=.png.o) \
-					$(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o)
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(sFILES:.s=.o) $(SFILES:.S=.o)
+export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
+
+export HFILES := $(addsuffix .h,$(subst .,_,$(BINFILES)))
 
 #---------------------------------------------------------------------------------
 # build a list of include paths
@@ -136,22 +131,27 @@ DEPENDS	:=	$(OFILES:.o=.d)
 $(OUTPUT).dol: $(OUTPUT).elf
 $(OUTPUT).elf: $(OFILES)
 
+$(OFILES_SOURCES): $(HFILES)
 #---------------------------------------------------------------------------------
 # This rule links in binary data with .ttf, .png, and .mp3 extensions
 #---------------------------------------------------------------------------------
-%.ttf.o : %.ttf
+%.ttf.o %_ttf.h : %.ttf
 	@echo $(notdir $<)
 	$(bin2o)
 
-%.png.o : %.png
+%.lang.o %_lang.h : %.lang
 	@echo $(notdir $<)
 	$(bin2o)
-	
-%.ogg.o : %.ogg
+
+%.png.o %_png.h : %.png
 	@echo $(notdir $<)
 	$(bin2o)
-	
-%.pcm.o : %.pcm
+
+%.ogg.o %_ogg.h : %.ogg
+	@echo $(notdir $<)
+	$(bin2o)
+
+%.pcm.o %_pcm.h : %.pcm
 	@echo $(notdir $<)
 	$(bin2o)
 
diff --git a/src/platform/wii/filelist.h b/src/platform/wii/filelist.h
index d62edde..8669f86 100644
--- a/src/platform/wii/filelist.h
+++ b/src/platform/wii/filelist.h
@@ -11,96 +11,66 @@
 #ifndef _FILELIST_H_
 #define _FILELIST_H_
 
-#include <gccore.h>
+// #include <gccore.h> // not necessary
 
-extern const u8		font_ttf[];
-extern const u32	font_ttf_size;
+#include <font_ttf.h>
 
-extern const u8		enter_ogg[];
-extern const u32	enter_ogg_size;
+#include <enter_ogg.h>
 
-extern const u8		exit_ogg[];
-extern const u32	exit_ogg_size;
+#include <exit_ogg.h>
 
-extern const u8		button_over_pcm[];
-extern const u32	button_over_pcm_size;
+#include <button_over_pcm.h>
 
-extern const u8		button_click_pcm[];
-extern const u32	button_click_pcm_size;
+#include <button_click_pcm.h>
 
-extern const u8		logo_png[];
-extern const u32	logo_png_size;
+#include <logo_png.h>
 
-extern const u8		logo_over_png[];
-extern const u32	logo_over_png_size;
+#include <logo_over_png.h>
 
-extern const u8		bg_top_png[];
-extern const u32	bg_top_png_size;
+#include <bg_top_png.h>
 
-extern const u8		bg_bottom_png[];
-extern const u32	bg_bottom_png_size;
+#include <bg_bottom_png.h>
 
-extern const u8		button_png[];
-extern const u32	button_png_size;
+#include <button_png.h>
 
-extern const u8		button_over_png[];
-extern const u32	button_over_png_size;
+#include <button_over_png.h>
 
-extern const u8		button_small_png[];
-extern const u32	button_small_png_size;
+#include <button_small_png.h>
 
-extern const u8		button_small_over_png[];
-extern const u32	button_small_over_png_size;
+#include <button_small_over_png.h>
 
-extern const u8		button_large_png[];
-extern const u32	button_large_png_size;
+#include <button_large_png.h>
 
-extern const u8		button_large_over_png[];
-extern const u32	button_large_over_png_size;
+#include <button_large_over_png.h>
 
-extern const u8		battery_png[];
-extern const u32	battery_png_size;
+#include <battery_png.h>
 
-extern const u8		battery_red_png[];
-extern const u32	battery_red_png_size;
+#include <battery_red_png.h>
 
-extern const u8		battery_bar_png[];
-extern const u32	battery_bar_png_size;
+#include <battery_bar_png.h>
 
-extern const u8		credits_box_png[];
-extern const u32	credits_box_png_size;
+#include <credits_box_png.h>
 
-extern const u8		keyboard_textbox_png[];
-extern const u32	keyboard_textbox_png_size;
+#include <keyboard_textbox_png.h>
 
-extern const u8		keyboard_key_png[];
-extern const u32	keyboard_key_png_size;
+#include <keyboard_key_png.h>
 
-extern const u8		keyboard_key_over_png[];
-extern const u32	keyboard_key_over_png_size;
+#include <keyboard_key_over_png.h>
 
-extern const u8		keyboard_mediumkey_png[];
-extern const u32	keyboard_mediumkey_png_size;
+#include <keyboard_mediumkey_png.h>
 
-extern const u8		keyboard_mediumkey_over_png[];
-extern const u32	keyboard_mediumkey_over_png_size;
+#include <keyboard_mediumkey_over_png.h>
 
-extern const u8		keyboard_largekey_png[];
-extern const u32	keyboard_largekey_png_size;
+#include <keyboard_largekey_png.h>
 
-extern const u8		keyboard_largekey_over_png[];
-extern const u32	keyboard_largekey_over_png_size;
+#include <keyboard_largekey_over_png.h>
 
-extern const u8		player1_point_png[];
-extern const u32	player1_point_png_size;
+#include <player1_point_png.h>
 
-extern const u8		player2_point_png[];
-extern const u32	player2_point_png_size;
+#include <player2_point_png.h>
 
-extern const u8		player3_point_png[];
-extern const u32	player3_point_png_size;
+#include <player3_point_png.h>
 
-extern const u8		player4_point_png[];
-extern const u32	player4_point_png_size;
+#include <player4_point_png.h>
 
 #endif