Fix build errors on GCC 4.0.x

This commit is contained in:
Themaister 2011-02-07 13:41:30 -06:00
parent 48881140e1
commit 761efbcc76
4 changed files with 4 additions and 8 deletions

View File

@ -8,8 +8,7 @@
#include "x86.c"
#elif defined(__GNUC__) && defined(__amd64__)
#include "amd64.c"
//#elif defined(__GNUC__) && defined(__powerpc__) && defined(__ELF__)
#elif defined(__GNUC__) && defined(__powerpc__) // Seems to run fine on PPC G5 OSX even when no __ELF__ is defined.
#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__POWERPC__)) // Seems to run fine on PPC G5 OSX even when no __ELF__ is defined.
#include "ppc.c"
#elif defined(__GNUC__)
#include "sjlj.c"

View File

@ -1,4 +1,4 @@
class Background {
struct Background {
struct ID { enum { BG1, BG2, BG3, BG4 }; };
unsigned id;
@ -69,5 +69,4 @@ class Background {
Background(PPU &self, unsigned id);
PPU &self;
friend class PPU;
};

View File

@ -1,4 +1,4 @@
class Sprite {
struct Sprite {
struct SpriteItem {
uint16 x;
uint16 y;
@ -77,5 +77,4 @@ class Sprite {
Sprite(PPU &self);
PPU &self;
friend class PPU;
};

View File

@ -1,4 +1,4 @@
class Window {
struct Window {
struct {
bool bg1_one_enable;
bool bg1_one_invert;
@ -84,5 +84,4 @@ class Window {
Window(PPU &self);
PPU &self;
friend class PPU;
};