Makefile.gc

@@ -22,7 +22,7 @@ SOURCES		:=	source source/images source/sounds source/fonts source/lang \
 				source/gui source/utils source/utils/sz \
 				source/vba source/vba/apu source/vba/common \
 				source/vba/gb source/vba/gba
-INCLUDES 	:=  source
+INCLUDES 	:=  source source/vba
 
 #---------------------------------------------------------------------------------
 # options for code generation

Makefile.wii

@@ -22,7 +22,7 @@ SOURCES		:=	source source/images source/sounds source/fonts source/lang \
 				source/gui source/utils source/utils/sz source/utils/unzip \
 				source/vba source/vba/apu source/vba/common \
 				source/vba/gb source/vba/gba
-INCLUDES 	:=  source
+INCLUDES 	:=  source source/vba
 
 #---------------------------------------------------------------------------------
 # options for code generation

source/gcunzip.cpp

@@ -14,18 +14,18 @@
 #include <string.h>
 #include <zlib.h>
 
-extern "C" {
-#include "utils/sz/7zCrc.h"
-#include "utils/sz/7zIn.h"
-#include "utils/sz/7zExtract.h"
-}
-
 #include "vbagx.h"
 #include "fileop.h"
 #include "filebrowser.h"
 #include "menu.h"
 #include "gcunzip.h"
 
+extern "C" {
+#include "utils/sz/7zCrc.h"
+#include "utils/sz/7zIn.h"
+#include "utils/sz/7zExtract.h"
+}
+
 #define ZIPCHUNK 2048
 
 /*

source/utils/gettext.cpp

@@ -6,7 +6,7 @@
 
 #include "gettext.h"
 #include "filelist.h"
-#include "vba.h"
+#include "vbagx.h"
 
 typedef struct _MSG
 {

source/utils/mload.c

@@ -15,11 +15,14 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifdef HW_RVL
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ogcsys.h>
 #include <gccore.h>
+#include <ogc/ipc.h>
 #include "unistd.h"
 #include "ehcmodule_elf.h"
 
@@ -274,3 +277,5 @@ bool load_ehci_module()
 	}
 	return true;
 }
+
+#endif

source/utils/usb2storage.c

@@ -30,6 +30,8 @@ distribution.
 
  -------------------------------------------------------------*/
 
+#ifdef HW_RVL
+
 #include <gccore.h>
 
 #include <ogc/lwp_heap.h>
@@ -41,6 +43,7 @@ distribution.
 #include <string.h>
 #include <unistd.h> 
 #include <ogc/machine/processor.h>
+#include <ogc/ipc.h>
 
 //#define DEBUG_USB2
 
@@ -449,3 +452,4 @@ const DISC_INTERFACE __io_usb2storage = {
 	(FN_MEDIUM_CLEARSTATUS) & __usb2storage_ClearStatus,
 	(FN_MEDIUM_SHUTDOWN) & __usb2storage_Shutdown
 };
+#endif

source/vba/Util.cpp

@@ -29,7 +29,7 @@
 #include "gba/Globals.h"
 #include "gba/RTC.h"
 #include "common/Port.h"
-#include "unzip.h"
+#include "../utils/unzip/unzip.h"
 
 extern "C" {
 #include "common/memgzio.h"

source/vba/gb/gbMono.cpp

@@ -8,9 +8,9 @@
 #include "gb.h"
 #include "gbCheats.h"
 #include "gbGlobals.h"
-#include "vba.h"
+#include "../../vbagx.h"
-#include "../ngc/menu.h"
+#include "../../menu.h"
-#include "../ngc/fastmath.h"
+#include "../../fastmath.h"
 
 #define CARLLOG
 

source/vbasupport.cpp

@@ -32,19 +32,19 @@
 #include "utils/pngu.h"
 #include "utils/unzip/unzip.h"
 
-#include "Util.h"
+#include "vba/Util.h"
-#include "common/Port.h"
+#include "vba/common/Port.h"
-#include "gba/Flash.h"
+#include "vba/common/Patch.h"
-#include "common/Patch.h"
+#include "vba/gba/Flash.h"
-#include "gba/RTC.h"
+#include "vba/gba/RTC.h"
-#include "gba/Sound.h"
+#include "vba/gba/Sound.h"
-#include "gba/Cheats.h"
+#include "vba/gba/Cheats.h"
-#include "gba/GBA.h"
+#include "vba/gba/GBA.h"
-#include "gba/agbprint.h"
+#include "vba/gba/agbprint.h"
-#include "gb/gb.h"
+#include "vba/gb/gb.h"
-#include "gb/gbGlobals.h"
+#include "vba/gb/gbGlobals.h"
-#include "gb/gbCheats.h"
+#include "vba/gb/gbCheats.h"
-#include "gb/gbSound.h"
+#include "vba/gb/gbSound.h"
 
 static u32 start;
 int cartridgeType = 0;

source/vbasupport.h

@@ -11,7 +11,7 @@
 #ifndef VBASUPPORT_H
 #define VBASUPPORT_H
 
-#include "System.h"
+#include "vba/System.h"
 
 extern struct EmulatedSystem emulator;
 extern int cartridgeType;