niklascfw/hekate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixes for compiling with gcc 10

Browse Source 
gcc 10 no longer lets you get away with not externing global variables in header files. This adds the necessary extern and adds defines in appropriate c files
This commit is contained in:
Dave Murphy
2020-05-08 23:32:44 +01:00
parent 9698cbc9d7
commit cc54df87d7
28 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nyx/nyx_gui/frontend/gui.c
View File

@@ -59,6 +59,28 @@ extern lv_res_t launch_payload(lv_obj_t *list);
static bool disp_init_done = false;
static bool do_reload = false;
lv_style_t hint_small_style;
lv_style_t hint_small_style_white;
lv_style_t monospace_text;
lv_obj_t *payload_list;
lv_obj_t *autorcm_btn;
lv_obj_t *close_btn;
lv_img_dsc_t *icon_switch;
lv_img_dsc_t *icon_payload;
lv_img_dsc_t *icon_lakka;
lv_img_dsc_t *hekate_bg;
lv_style_t btn_transp_rel, btn_transp_pr, btn_transp_tgl_rel, btn_transp_tgl_pr;
lv_style_t ddlist_transp_bg, ddlist_transp_sel;
lv_style_t tabview_btn_pr, tabview_btn_tgl_pr;
lv_style_t mbox_darken;
char *text_color;
typedef struct _gui_status_bar_ctx
{
lv_obj_t *mid;

30
nyx/nyx_gui/frontend/gui.h
View File

@@ -34,27 +34,27 @@ typedef struct _emmc_tool_gui_t
bool raw_emummc;
} emmc_tool_gui_t;
lv_style_t hint_small_style;
lv_style_t hint_small_style_white;
lv_style_t monospace_text;
extern lv_style_t hint_small_style;
extern lv_style_t hint_small_style_white;
extern lv_style_t monospace_text;
lv_obj_t *payload_list;
lv_obj_t *autorcm_btn;
lv_obj_t *close_btn;
extern lv_obj_t *payload_list;
extern lv_obj_t *autorcm_btn;
extern lv_obj_t *close_btn;
lv_img_dsc_t *icon_switch;
lv_img_dsc_t *icon_payload;
lv_img_dsc_t *icon_lakka;
extern lv_img_dsc_t *icon_switch;
extern lv_img_dsc_t *icon_payload;
extern lv_img_dsc_t *icon_lakka;
lv_img_dsc_t *hekate_bg;
extern lv_img_dsc_t *hekate_bg;
lv_style_t btn_transp_rel, btn_transp_pr, btn_transp_tgl_rel, btn_transp_tgl_pr;
lv_style_t ddlist_transp_bg, ddlist_transp_sel;
lv_style_t tabview_btn_pr, tabview_btn_tgl_pr;
extern lv_style_t btn_transp_rel, btn_transp_pr, btn_transp_tgl_rel, btn_transp_tgl_pr;
extern lv_style_t ddlist_transp_bg, ddlist_transp_sel;
extern lv_style_t tabview_btn_pr, tabview_btn_tgl_pr;
lv_style_t mbox_darken;
extern lv_style_t mbox_darken;
char *text_color;
extern char *text_color;
void reload_nyx();
lv_img_dsc_t *bmp_to_lvimg_obj(const char *path);

2
nyx/nyx_gui/frontend/gui_emmc_tools.c
View File

@@ -39,6 +39,8 @@ extern hekate_config h_cfg;
extern void emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t *storage);
lv_obj_t *ums_mbox;
typedef struct _emmc_backup_buttons_t
{
lv_obj_t *emmc_boot;

2
nyx/nyx_gui/frontend/gui_tools.h
View File

@@ -19,7 +19,7 @@
#include "../libs/lvgl/lvgl.h"
lv_obj_t *ums_mbox;
extern lv_obj_t *ums_mbox;
void create_tab_tools(lv_theme_t *th, lv_obj_t *parent);
void nyx_run_ums(void *param);