From a59ecff899ed431c6db9709533cb06b7aef40b07 Mon Sep 17 00:00:00 2001
From: dborth <dborth@d154fe42-be53-0410-aac0-356034171556>
Date: Thu, 21 May 2009 04:17:44 +0000
Subject: [PATCH] corrections to compile on r18

---
 Makefile.gc                   |  2 +-
 Makefile.wii                  |  2 +-
 source/ngc/FreeTypeGX.h       |  1 +
 source/ngc/gui/gui.h          |  1 +
 source/ngc/gui/gui_button.cpp | 12 ++++++------
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile.gc b/Makefile.gc
index dfc3a65..0cbaacb 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -33,7 +33,7 @@ CFLAGS	=	-g -O3 -Wall $(MACHDEP) $(INCLUDE) \
 			-DSPC700_C -DSDD1_DECOMP \
 			-DCORRECT_VRAM_READS -DNEW_COLOUR_BLENDING \
 			-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
 
 CXXFLAGS	=	$(CFLAGS)
diff --git a/Makefile.wii b/Makefile.wii
index 7dd5abf..7794a20 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -33,7 +33,7 @@ CFLAGS	=	-g -O3 -Wall $(MACHDEP) $(INCLUDE) \
 			-DSPC700_C -DSDD1_DECOMP \
 			-DCORRECT_VRAM_READS -DNEW_COLOUR_BLENDING \
 			-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
 
 CXXFLAGS	=	-save-temps -Xassembler -aln=$@.lst $(CFLAGS)
diff --git a/source/ngc/FreeTypeGX.h b/source/ngc/FreeTypeGX.h
index 935cd7d..85453cd 100644
--- a/source/ngc/FreeTypeGX.h
+++ b/source/ngc/FreeTypeGX.h
@@ -159,6 +159,7 @@
 
 #include <malloc.h>
 #include <string.h>
+#include <wchar.h>
 #include <map>
 
 /*! \struct ftgxCharData_
diff --git a/source/ngc/gui/gui.h b/source/ngc/gui/gui.h
index 6bdbe5d..adf36c9 100644
--- a/source/ngc/gui/gui.h
+++ b/source/ngc/gui/gui.h
@@ -37,6 +37,7 @@
 #include <string.h>
 #include <vector>
 #include <exception>
+#include <wchar.h>
 #include <math.h>
 #include <asndlib.h>
 #include <wiiuse/wpad.h>
diff --git a/source/ngc/gui/gui_button.cpp b/source/ngc/gui/gui_button.cpp
index 16299b4..b4064b0 100644
--- a/source/ngc/gui/gui_button.cpp
+++ b/source/ngc/gui/gui_button.cpp
@@ -218,8 +218,8 @@ void GuiButton::Update(GuiTrigger * t)
 
 				if(
 					(t->wpad.btns_d > 0 &&
-					wm_btns == wm_btns_trig ||
-					(cc_btns == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC)) ||
+					(wm_btns == wm_btns_trig ||
+					(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))
 				{
 					if(t->chan == stateChan || stateChan == -1)
@@ -267,8 +267,8 @@ void GuiButton::Update(GuiTrigger * t)
 
 				if(
 					(t->wpad.btns_d > 0 &&
-					wm_btns == wm_btns_trig ||
-					(cc_btns == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC)) ||
+					(wm_btns == wm_btns_trig ||
+					(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))
 				{
 					if(trigger[i]->type == TRIGGER_HELD && state == STATE_SELECTED &&
@@ -278,8 +278,8 @@ void GuiButton::Update(GuiTrigger * t)
 
 				if(
 					(t->wpad.btns_h > 0 &&
-					wm_btns_h == wm_btns_trig ||
-					(cc_btns_h == cc_btns_trig && t->wpad.exp.type == EXP_CLASSIC)) ||
+					(wm_btns_h == wm_btns_trig ||
+					(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))
 				{
 					if(trigger[i]->type == TRIGGER_HELD)