ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now compiles under GCC 10 (GCC 10 now defaults to -fno-common)

Browse Source
This commit is contained in:
Dylan G
2020-05-31 17:45:05 +01:00
parent 193feedf25
commit ef774ce0b4
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/colors.h
View File

@@ -31,7 +31,7 @@
typedef u32 Color; typedef u32 Color;
enum { typedef enum {
COLOR_BACKGROUND, //silver-y black COLOR_BACKGROUND, //silver-y black
COLOR_ACCENT, COLOR_ACCENT,
COLOR_WHITE, COLOR_WHITE,

4
include/draw.h
View File

@@ -125,7 +125,7 @@ typedef enum {
#define BUTTONS_INFO_LINES 4 #define BUTTONS_INFO_LINES 4
#define BUTTONS_INFO_COLUNMNS 2 #define BUTTONS_INFO_COLUNMNS 2
enum { typedef enum {
BUTTONS_Y_INFO = BUTTONS_START_Y+5, BUTTONS_Y_INFO = BUTTONS_START_Y+5,
BUTTONS_Y_LINE_1 = BUTTONS_START_Y + BUTTONS_STEP*1, BUTTONS_Y_LINE_1 = BUTTONS_START_Y + BUTTONS_STEP*1,
@@ -173,4 +173,4 @@ void draw_base_interface(void);
void draw_grid_interface(Entry_List_s* list, Instructions_s instructions); void draw_grid_interface(Entry_List_s* list, Instructions_s instructions);
void draw_interface(Entry_List_s* list, Instructions_s instructions); void draw_interface(Entry_List_s* list, Instructions_s instructions);
#endif #endif

8
include/fs.h
View File

@@ -29,9 +29,9 @@
#include "common.h" #include "common.h"
FS_Archive ArchiveSD; extern FS_Archive ArchiveSD;
FS_Archive ArchiveHomeExt; extern FS_Archive ArchiveHomeExt;
FS_Archive ArchiveThemeExt; extern FS_Archive ArchiveThemeExt;
Result open_archives(void); Result open_archives(void);
Result close_archives(void); Result close_archives(void);
@@ -43,4 +43,4 @@ u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf);
Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf); Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf);
void remake_file(FS_Path path, FS_Archive archive, u32 size); void remake_file(FS_Path path, FS_Archive archive, u32 size);
#endif #endif

6
source/fs.c
View File

@@ -31,6 +31,10 @@
#include <archive.h> #include <archive.h>
#include <archive_entry.h> #include <archive_entry.h>
FS_Archive ArchiveSD;
FS_Archive ArchiveHomeExt;
FS_Archive ArchiveThemeExt;
Result open_archives(void) Result open_archives(void)
{ {
@@ -203,4 +207,4 @@ void remake_file(FS_Path path, FS_Archive archive, u32 size)
char *buf = calloc(size, 1); char *buf = calloc(size, 1);
buf_to_file(size, path, archive, buf); buf_to_file(size, path, archive, buf);
free(buf); free(buf);
} }