use generated headers

This commit is contained in:
Dave Murphy 2021-04-07 00:45:40 +01:00
parent 3eac114065
commit 0181eeaab9
8 changed files with 144 additions and 144 deletions

View File

@ -124,22 +124,22 @@ $(OUTPUT).elf: $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# This rule links in binary data with the various extension # This rule links in binary data with the various extension
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.jpg.o : %.jpg %.jpg.o %_jpg.h : %.jpg
@echo $(notdir $<) $(SILENTMSG) $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@) $(SILENTCMD)$(bin2o)
%.png.o : %.png %.png.o %_png.h : %.png
@echo $(notdir $<) $(SILENTMSG) $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@) $(SILENTCMD)$(bin2o)
%.pcm.o : %.pcm %.pcm.o %_pcm.h : %.pcm
@echo $(notdir $<) $(SILENTMSG) $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@) $(SILENTCMD)$(bin2o)
%.ogg.o : %.ogg %.ogg.o %_ogg.h : %.ogg
@echo $(notdir $<) $(SILENTMSG) $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@) $(SILENTCMD)$(bin2o)
-include $(DEPENDS) -include $(DEPENDS)

View File

@ -128,21 +128,22 @@ $(OUTPUT).elf: $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# This rule links in binary data with the various extension # This rule links in binary data with the various extension
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.jpg.o : %.jpg %.jpg.o %_jpg.h : %.jpg
@echo $(notdir $<) $(SILENTMSG) $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@) $(SILENTCMD)$(bin2o)
%.png.o : %.png
@echo $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@)
%.pcm.o : %.pcm %.png.o %_png.h : %.png
@echo $(notdir $<) $(SILENTMSG) $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@) $(SILENTCMD)$(bin2o)
%.ogg.o : %.ogg %.pcm.o %_pcm.h : %.pcm
@echo $(notdir $<) $(SILENTMSG) $(notdir $<)
bin2s -a 32 $< | $(AS) -o $(@) $(SILENTCMD)$(bin2o)
%.ogg.o %_ogg.h : %.ogg
$(SILENTMSG) $(notdir $<)
$(SILENTCMD)$(bin2o)
-include $(DEPENDS) -include $(DEPENDS)

View File

@ -50,13 +50,13 @@
#define MAX_DESC_LENGTH (63) #define MAX_DESC_LENGTH (63)
#ifdef HW_RVL #ifdef HW_RVL
extern const u8 Key_Minus_wii_png[]; #include "Key_Minus_wii_png.h"
extern const u8 Key_Plus_wii_png[]; #include "Key_Plus_wii_png.h"
#else #else
extern const u8 Key_R_gcn_png[]; #include "Key_R_gcn_png.h"
extern const u8 Key_L_gcn_png[]; #include "Key_L_gcn_png.h"
#endif #endif
extern const u8 Key_DPAD_png[]; #include "Key_DPAD_png.h"
typedef struct typedef struct
{ {

View File

@ -49,12 +49,12 @@
#define SCROLL_SPEED 10 #define SCROLL_SPEED 10
extern const u8 Browser_dir_png[]; #include "Browser_dir_png.h"
extern const u8 Snap_empty_png[]; #include "Snap_empty_png.h"
extern const u8 Cart_md_png[]; #include "Cart_md_png.h"
extern const u8 Cart_ms_png[]; #include "Cart_ms_png.h"
extern const u8 Cart_gg_png[]; #include "Cart_gg_png.h"
extern const u8 Cart_sg_png[]; #include "Cart_sg_png.h"
FILEENTRIES filelist[MAXFILES]; FILEENTRIES filelist[MAXFILES];

View File

@ -168,61 +168,60 @@ extern gx_texture *w_pointer;
#endif #endif
/* Generic backgrounds */ /* Generic backgrounds */
extern const u8 Bg_layer_png[]; #include "Bg_layer_png.h"
extern const u8 Bg_overlay_png[]; #include "Bg_overlay_png.h"
extern const u8 Banner_main_png[]; #include "Banner_main_png.h"
extern const u8 Banner_bottom_png[]; #include "Banner_bottom_png.h"
extern const u8 Banner_top_png[]; #include "Banner_top_png.h"
extern const u8 Main_logo_png[]; #include "Main_logo_png.h"
/* Generic frames */ /* Generic frames */
extern const u8 Frame_s1_png[]; #include "Frame_s1_png.h"
extern const u8 Frame_s2_png[]; #include "Frame_s2_png.h"
extern const u8 Frame_s3_png[]; #include "Frame_s3_png.h"
extern const u8 Frame_s1_title_png[]; #include "Frame_s1_title_png.h"
extern const u8 Frame_s2_title_png[]; #include "Frame_s2_title_png.h"
extern const u8 Frame_throbber_png[]; #include "Frame_throbber_png.h"
/* Generic Buttons */ /* Generic Buttons */
extern const u8 Button_text_png[]; #include "Button_text_png.h"
extern const u8 Button_text_over_png[]; #include "Button_text_over_png.h"
extern const u8 Button_icon_png[]; #include "Button_icon_png.h"
extern const u8 Button_icon_over_png[]; #include "Button_icon_over_png.h"
extern const u8 Button_icon_sm_png[]; #include "Button_icon_sm_png.h"
extern const u8 Button_icon_sm_over_png[]; #include "Button_icon_sm_over_png.h"
extern const u8 Button_up_png[]; #include "Button_up_png.h"
extern const u8 Button_up_over_png[]; #include "Button_up_over_png.h"
extern const u8 Button_down_png[]; #include "Button_down_png.h"
extern const u8 Button_down_over_png[]; #include "Button_down_over_png.h"
extern const u8 Button_arrow_png[]; #include "Button_arrow_png.h"
extern const u8 Button_arrow_over_png[]; #include "Button_arrow_over_png.h"
extern const u8 Button_digit_png[]; #include "Button_digit_png.h"
extern const u8 Button_digit_over_png[]; #include "Button_digit_over_png.h"
/* Generic images*/ /* Generic images*/
#ifdef HW_RVL #ifdef HW_RVL
#define Key_A_png Key_A_wii_png #define Key_A_png Key_A_wii_png
#define Key_B_png Key_B_wii_png #define Key_B_png Key_B_wii_png
extern const u8 generic_point_png[]; #include "generic_point_png.h"
extern const u8 Key_A_wii_png[]; #include "Key_A_wii_png.h"
extern const u8 Key_B_wii_png[]; #include "Key_B_wii_png.h"
#else #else
#define Key_A_png Key_A_gcn_png #define Key_A_png Key_A_gcn_png
#define Key_B_png Key_B_gcn_png #define Key_B_png Key_B_gcn_png
extern const u8 Key_A_gcn_png[]; #include "Key_A_gcn_png.h"
extern const u8 Key_B_gcn_png[]; #include "Key_B_gcn_png.h"
#endif #endif
extern const u8 Star_full_png[]; #include "Star_full_png.h"
extern const u8 Star_empty_png[]; #include "Star_empty_png.h"
extern const u8 Overlay_bar_png[]; #include "Overlay_bar_png.h"
/* Generic Sounds */ /* Generic Sounds */
extern const u8 button_over_pcm[];
extern const u8 button_select_pcm[]; #include "button_over_pcm.h"
extern const u8 intro_pcm[]; #include "button_select_pcm.h"
extern const u32 button_select_pcm_size; #include "intro_pcm.h"
extern const u32 button_over_pcm_size;
extern const u32 intro_pcm_size;
extern u8 SILENT; extern u8 SILENT;

View File

@ -41,10 +41,10 @@
#include "font.h" #include "font.h"
#include "gui.h" #include "gui.h"
extern const u8 Bg_intro_c1_png[]; #include "Bg_intro_c1_png.h"
extern const u8 Bg_intro_c2_png[]; #include "Bg_intro_c2_png.h"
extern const u8 Bg_intro_c3_png[]; #include "Bg_intro_c3_png.h"
extern const u8 Bg_intro_c4_png[]; #include "Bg_intro_c4_png.h"
/* /*
* This is the legal stuff - which must be shown at program startup * This is the legal stuff - which must be shown at program startup

View File

@ -54,82 +54,82 @@
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
/* Credits */ /* Credits */
extern const u8 Bg_credits_png[]; #include "Bg_credits_png.h"
/* Main menu */ /* Main menu */
extern const u8 Main_load_png[]; #include "Main_load_png.h"
extern const u8 Main_options_png[]; #include "Main_options_png.h"
extern const u8 Main_quit_png[]; #include "Main_quit_png.h"
extern const u8 Main_file_png[]; #include "Main_file_png.h"
extern const u8 Main_reset_png[]; #include "Main_reset_png.h"
extern const u8 Main_cheats_png[]; #include "Main_cheats_png.h"
extern const u8 Main_showinfo_png[]; #include "Main_showinfo_png.h"
extern const u8 Main_takeshot_png[]; #include "Main_takeshot_png.h"
#ifdef HW_RVL #ifdef HW_RVL
extern const u8 Main_play_wii_png[]; #include "Main_play_wii_png.h"
#else #else
extern const u8 Main_play_gcn_png[]; #include "Main_play_gcn_png.h"
#endif #endif
/* Options menu */ /* Options menu */
extern const u8 Option_menu_png[]; #include "Option_menu_png.h"
extern const u8 Option_ctrl_png[]; #include "Option_ctrl_png.h"
extern const u8 Option_sound_png[]; #include "Option_sound_png.h"
extern const u8 Option_video_png[]; #include "Option_video_png.h"
extern const u8 Option_system_png[]; #include "Option_system_png.h"
/* Load ROM menu */ /* Load ROM menu */
extern const u8 Load_recent_png[]; #include "Load_recent_png.h"
extern const u8 Load_md_png[]; #include "Load_md_png.h"
extern const u8 Load_ms_png[]; #include "Load_ms_png.h"
extern const u8 Load_gg_png[]; #include "Load_gg_png.h"
extern const u8 Load_sg_png[]; #include "Load_sg_png.h"
extern const u8 Load_cd_png[]; #include "Load_cd_png.h"
/* Save Manager menu */ /* Save Manager menu */
extern const u8 Button_load_png[]; #include "Button_load_png.h"
extern const u8 Button_load_over_png[]; #include "Button_load_over_png.h"
extern const u8 Button_save_png[]; #include "Button_save_png.h"
extern const u8 Button_save_over_png[]; #include "Button_save_over_png.h"
extern const u8 Button_special_png[]; #include "Button_special_png.h"
extern const u8 Button_special_over_png[]; #include "Button_special_over_png.h"
extern const u8 Button_delete_png[]; #include "Button_delete_png.h"
extern const u8 Button_delete_over_png[]; #include "Button_delete_over_png.h"
/* Controller Settings */ /* Controller Settings */
extern const u8 Ctrl_4wayplay_png[]; #include "Ctrl_4wayplay_png.h"
extern const u8 Ctrl_gamepad_png[]; #include "Ctrl_gamepad_png.h"
extern const u8 Ctrl_justifiers_png[]; #include "Ctrl_justifiers_png.h"
extern const u8 Ctrl_menacer_png[]; #include "Ctrl_menacer_png.h"
extern const u8 Ctrl_mouse_png[]; #include "Ctrl_mouse_png.h"
extern const u8 Ctrl_xe_1ap_png[]; #include "Ctrl_xe_1ap_png.h"
extern const u8 Ctrl_activator_png[]; #include "Ctrl_activator_png.h"
extern const u8 Ctrl_lightphaser_png[]; #include "Ctrl_lightphaser_png.h"
extern const u8 Ctrl_paddle_png[]; #include "Ctrl_paddle_png.h"
extern const u8 Ctrl_sportspad_png[]; #include "Ctrl_sportspad_png.h"
extern const u8 Ctrl_none_png[]; #include "Ctrl_none_png.h"
extern const u8 Ctrl_teamplayer_png[]; #include "Ctrl_teamplayer_png.h"
extern const u8 Ctrl_mastertap_png[]; #include "Ctrl_mastertap_png.h"
extern const u8 Ctrl_graphic_board_png[]; #include "Ctrl_graphic_board_png.h"
extern const u8 Ctrl_pad_auto_png[]; #include "Ctrl_pad_auto_png.h"
extern const u8 Ctrl_pad2b_png[]; #include "Ctrl_pad2b_png.h"
extern const u8 Ctrl_pad3b_png[]; #include "Ctrl_pad3b_png.h"
extern const u8 Ctrl_pad6b_png[]; #include "Ctrl_pad6b_png.h"
extern const u8 Ctrl_config_png[]; #include "Ctrl_config_png.h"
extern const u8 ctrl_option_off_png[]; #include "ctrl_option_off_png.h"
extern const u8 ctrl_option_on_png[]; #include "ctrl_option_on_png.h"
extern const u8 ctrl_gamecube_png[]; #include "ctrl_gamecube_png.h"
#ifdef HW_RVL #ifdef HW_RVL
extern const u8 ctrl_classic_png[]; #include "ctrl_classic_png.h"
extern const u8 ctrl_nunchuk_png[]; #include "ctrl_nunchuk_png.h"
extern const u8 ctrl_wiimote_png[]; #include "ctrl_wiimote_png.h"
extern const u8 ctrl_wiiu_png[]; #include "ctrl_wiiu_png.h"
#endif #endif
/* Generic images */ /* Generic images */
extern const u8 Button_sm_blue_png[]; #include "Button_sm_blue_png.h"
extern const u8 Button_sm_grey_png[]; #include "Button_sm_grey_png.h"
extern const u8 Button_sm_yellow_png[]; #include "Button_sm_yellow_png.h"
/* Exit callback */ /* Exit callback */
void (*reload)(void); void (*reload)(void);

View File

@ -53,12 +53,12 @@ typedef struct
u32 offset; u32 offset;
} png_image_desc; } png_image_desc;
extern const u8 Crosshair_p1_png[]; #include "Crosshair_p1_png.h"
extern const u8 Crosshair_p2_png[]; #include "Crosshair_p2_png.h"
extern const u8 CD_access_off_png[]; #include "CD_access_off_png.h"
extern const u8 CD_access_on_png[]; #include "CD_access_on_png.h"
extern const u8 CD_ready_off_png[]; #include "CD_ready_off_png.h"
extern const u8 CD_ready_on_png[]; #include "CD_ready_on_png.h"
/*** VI Mode ***/ /*** VI Mode ***/
GXRModeObj *vmode; GXRModeObj *vmode;