gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #504 from runlevel5/gcc10-fix

Browse Source 
Fix multiple definitions for GCC10
This commit is contained in:
Eldred Habert
2020-04-07 15:18:23 +02:00
committed by GitHub
parent 927c65e863 65121e6d5d
commit 562835308b
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gfx/main.h
View File

@@ -83,7 +83,7 @@ struct Mapfile {
int size; int size;
}; };
int depth, colors; extern int depth, colors;
#include "gfx/makepng.h" #include "gfx/makepng.h"
#include "gfx/gb.h" #include "gfx/gb.h"

2
src/gfx/gb.c
View File

@@ -10,7 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "gfx/main.h" #include "gfx/gb.h"
void transpose_tiles(struct GBImage *gb, int width) void transpose_tiles(struct GBImage *gb, int width)
{ {

2
src/gfx/main.c
View File

@@ -15,6 +15,8 @@
#include "extern/getopt.h" #include "extern/getopt.h"
#include "version.h" #include "version.h"
int depth, colors;
/* Short options */ /* Short options */
static char const *optstring = "Aa:CDd:Ffhmo:Pp:Tt:uVvx:"; static char const *optstring = "Aa:CDd:Ffhmo:Pp:Tt:uVvx:";

2
src/gfx/makepng.c
View File

@@ -11,7 +11,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "gfx/main.h" #include "gfx/makepng.h"
static void initialize_png(struct PNGImage *img, FILE * f); static void initialize_png(struct PNGImage *img, FILE * f);
static struct RawIndexedImage *indexed_png_to_raw(struct PNGImage *img); static struct RawIndexedImage *indexed_png_to_raw(struct PNGImage *img);