The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2025-01-07 14:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

corrections to compile on r18

Browse Source
This commit is contained in:
dborth 2009-05-21 04:15:32 +00:00
parent d08fa5f0e3
commit 634c0df170
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.gc
View File

@ -31,7 +31,7 @@ INCLUDES := source/fceultra source/ngc source/unzip
CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC -DNO_SOUND \ CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC -DNO_SOUND \
-DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \ -DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \
-D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \ -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
-fomit-frame-pointer -fno-exceptions \ -fomit-frame-pointer \
-Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-parameter -Wno-strict-aliasing
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)

2
Makefile.wii
View File

@ -31,7 +31,7 @@ INCLUDES := source/fceultra source/ngc source/unzip
CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC \ CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC \
-DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \ -DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \
-D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \ -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
-fomit-frame-pointer -fno-exceptions \ -fomit-frame-pointer \
-Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-parameter -Wno-strict-aliasing
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)

1
source/ngc/FreeTypeGX.h
View File

@ -159,6 +159,7 @@
#include <malloc.h> #include <malloc.h>
#include <string.h> #include <string.h>
#include <wchar.h>
#include <map> #include <map>
/*! \struct ftgxCharData_ /*! \struct ftgxCharData_

1
source/ngc/gui/gui.h
View File

@ -37,6 +37,7 @@
#include <string.h> #include <string.h>
#include <vector> #include <vector>
#include <exception> #include <exception>
#include <wchar.h>
#include <math.h> #include <math.h>
#include <asndlib.h> #include <asndlib.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>

12
source/ngc/gui/gui_button.cpp
View File

@ -218,8 +218,8 @@ void GuiButton::Update(GuiTrigger * t)
if( if(
(t->wpad.btns_d > 0 && (t->wpad.btns_d > 0 &&
wm_btns == wm_btns_trig || (wm_btns == wm_btns_trig ||
(cc_btns == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC)) || (cc_btns == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC))) ||
(t->pad.btns_d == trigger[i]->pad.btns_d && t->pad.btns_d > 0)) (t->pad.btns_d == trigger[i]->pad.btns_d && t->pad.btns_d > 0))
{ {
if(t->chan == stateChan || stateChan == -1) if(t->chan == stateChan || stateChan == -1)
@ -267,8 +267,8 @@ void GuiButton::Update(GuiTrigger * t)
if( if(
(t->wpad.btns_d > 0 && (t->wpad.btns_d > 0 &&
wm_btns == wm_btns_trig || (wm_btns == wm_btns_trig ||
(cc_btns == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC)) || (cc_btns == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC))) ||
(t->pad.btns_d == trigger[i]->pad.btns_h && t->pad.btns_d > 0)) (t->pad.btns_d == trigger[i]->pad.btns_h && t->pad.btns_d > 0))
{ {
if(trigger[i]->type == TRIGGER_HELD && state == STATE_SELECTED && if(trigger[i]->type == TRIGGER_HELD && state == STATE_SELECTED &&
@ -278,8 +278,8 @@ void GuiButton::Update(GuiTrigger * t)
if( if(
(t->wpad.btns_h > 0 && (t->wpad.btns_h > 0 &&
wm_btns_h == wm_btns_trig || (wm_btns_h == wm_btns_trig ||
(cc_btns_h == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC)) || (cc_btns_h == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC))) ||
(t->pad.btns_h == trigger[i]->pad.btns_h && t->pad.btns_h > 0)) (t->pad.btns_h == trigger[i]->pad.btns_h && t->pad.btns_h > 0))
{ {
if(trigger[i]->type == TRIGGER_HELD) if(trigger[i]->type == TRIGGER_HELD)