update includes to match new structure

Makefile.gc

@@ -18,7 +18,8 @@ include $(DEVKITPPC)/gamecube_rules
 TARGET		:=	vbagx_gc
 TARGETDIR   :=  executables
 BUILD		:=	build_gc
-SOURCES		:=	source/vba source/vba/agb source/vba/dmg source/vba/dmg/gb_apu \
+SOURCES		:=	source/vba source/vba/apu source/vba/common \
+				source/vba/gb source/vba/gba \
 				source/ngc source/sz source/unzip
 INCLUDES 	:=  source/vba source/ngc source/unzip
 
@@ -103,7 +104,6 @@ $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
 	@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
 	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.gc
-	@rm -fr $(OUTPUT).elf
 
 #---------------------------------------------------------------------------------
 clean:

Makefile.wii

@@ -18,7 +18,8 @@ include $(DEVKITPPC)/wii_rules
 TARGET		:=	vbagx_wii
 TARGETDIR   :=  executables
 BUILD		:=	build_wii
-SOURCES		:=	source/vba source/vba/agb source/vba/dmg source/vba/dmg/gb_apu \
+SOURCES		:=	source/vba source/vba/apu source/vba/common \
+				source/vba/gb source/vba/gba \
 				source/ngc source/sz source/unzip
 INCLUDES 	:=  source/vba source/ngc source/unzip
 

source/vba/Util.cpp

@@ -30,15 +30,15 @@ extern "C" {
 #include "System.h"
 #include "NLS.h"
 #include "Util.h"
-#include "Flash.h"
+#include "gba/Flash.h"
-#include "agb/GBA.h"
+#include "gba/GBA.h"
-#include "Globals.h"
+#include "gba/Globals.h"
-#include "RTC.h"
+#include "gba/RTC.h"
-#include "Port.h"
+#include "common/Port.h"
 #include "unzip.h"
 
 extern "C" {
-#include "memgzio.h"
+#include "common/memgzio.h"
 }
 
 #ifndef _MSC_VER

source/vba/common/Patch.cpp

@@ -21,7 +21,7 @@
 #include <string.h>
 #include <zlib.h>
 
-#include "System.h"
+#include "../System.h"
 #include "memfile.h"
 
 /*

source/vba/common/memgzio.c

@@ -14,7 +14,8 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-
+#include <string.h>
+#include <errno.h>
 #include "memgzio.h"
 
 /*struct internal_state {int dummy;};*/ /* for buggy compilers */

source/vba/common/memgzio.h

@@ -11,9 +11,22 @@
 #ifndef HAVE_ZUTIL_H
 #include "../win32/include/zlib/zutil.h"
 #else
-#include <zutil.h>
+#include <zlib.h>
 #endif
 
+#ifndef local
+#  define local static
+#endif
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+#define OS_CODE  0x03  /* assume Unix */
+#define zmemcpy memcpy
+
 gzFile ZEXPORT memgzopen(char *memory, int, const char *);
 int ZEXPORT memgzread(gzFile, voidp, unsigned);
 int ZEXPORT memgzwrite(gzFile, const voidp, unsigned);

source/vba/gb/gbGfx.cpp

@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
 #include "gbGlobals.h"
 #include "gbSGB.h"
 

source/vba/gb/gbGlobals.cpp

@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
 
 u8 *gbMemoryMap[16];
 

source/vba/gb/gbMemory.cpp

@@ -16,8 +16,8 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
-#include "../Port.h"
+#include "../common/Port.h"
 #include "gbGlobals.h"
 #include "gbMemory.h"
 #include "gb.h"

source/vba/gb/gbPrinter.cpp

@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
 
 u8 gbPrinterStatus = 0;
 int gbPrinterState = 0;

source/vba/gb/gbSGB.cpp

@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "../System.h"
-#include "../Port.h"
+#include "../common/Port.h"
 #include "../Util.h"
 #include "gb.h"
 #include "gbGlobals.h"

source/vba/gb/gbSound.cpp

@@ -20,13 +20,13 @@
 
 #include <string.h>
 
-#include "../Sound.h"
+#include "../gba/Sound.h"
 #include "../Util.h"
 #include "gbGlobals.h"
 #include "gbSound.h"
 
-#include "gb_apu/Gb_Apu.h"
+#include "../apu/Gb_Apu.h"
-#include "gb_apu/Effects_Buffer.h"
+#include "../apu/Effects_Buffer.h"
 
 extern int gbHardware;
 

source/vba/gba/Cheats.cpp

@@ -20,12 +20,12 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "agb/GBA.h"
+#include "GBA.h"
-#include "agb/GBAinline.h"
+#include "GBAinline.h"
 #include "Cheats.h"
 #include "Globals.h"
-#include "NLS.h"
+#include "../NLS.h"
-#include "Util.h"
+#include "../Util.h"
 
 /**
  * Gameshark code types: (based on AR v1.0)

source/vba/gba/EEprom.cpp

@@ -17,9 +17,9 @@
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include <string.h>
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "EEprom.h"
-#include "Util.h"
+#include "../Util.h"
 
 extern int cpuDmaCount;
 

source/vba/gba/Flash.cpp

@@ -18,11 +18,11 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
 #include "Flash.h"
 #include "Sram.h"
-#include "Util.h"
+#include "../Util.h"
 
 #define FLASH_READ_ARRAY         0
 #define FLASH_CMD_1              1

source/vba/gba/GBA-arm.cpp

@@ -25,17 +25,17 @@
 #include "GBA.h"
 #include "GBAcpu.h"
 #include "GBAinline.h"
-#include "../Globals.h"
+#include "Globals.h"
-#include "../EEprom.h"
+#include "EEprom.h"
-#include "../Flash.h"
+#include "Flash.h"
-#include "../Sound.h"
+#include "Sound.h"
-#include "../Sram.h"
+#include "Sram.h"
-#include "../bios.h"
+#include "bios.h"
-#include "../Cheats.h"
+#include "Cheats.h"
 #include "../NLS.h"
-#include "../elf.h"
+#include "elf.h"
 #include "../Util.h"
-#include "../Port.h"
+#include "../common/Port.h"
 #include "../System.h"
 #include "agbprint.h"
 #ifdef PROFILING

source/vba/gba/GBA-thumb.cpp

@@ -27,17 +27,17 @@
 #include "GBA.h"
 #include "GBAcpu.h"
 #include "GBAinline.h"
-#include "../Globals.h"
+#include "Globals.h"
-#include "../EEprom.h"
+#include "EEprom.h"
-#include "../Flash.h"
+#include "Flash.h"
-#include "../Sound.h"
+#include "Sound.h"
-#include "../Sram.h"
+#include "Sram.h"
-#include "../bios.h"
+#include "bios.h"
-#include "../Cheats.h"
+#include "Cheats.h"
 #include "../NLS.h"
-#include "../elf.h"
+#include "elf.h"
 #include "../Util.h"
-#include "../Port.h"
+#include "../common/Port.h"
 #include "../System.h"
 #include "agbprint.h"
 #ifdef PROFILING

source/vba/gba/GBA.cpp

@@ -23,18 +23,18 @@
 #include "GBA.h"
 #include "GBAcpu.h"
 #include "GBAinline.h"
-#include "../Globals.h"
+#include "Globals.h"
 #include "GBAGfx.h"
-#include "../EEprom.h"
+#include "EEprom.h"
-#include "../Flash.h"
+#include "Flash.h"
-#include "../Sound.h"
+#include "Sound.h"
-#include "../Sram.h"
+#include "Sram.h"
-#include "../bios.h"
+#include "bios.h"
-#include "../Cheats.h"
+#include "Cheats.h"
 #include "../NLS.h"
-#include "../elf.h"
+#include "elf.h"
 #include "../Util.h"
-#include "../Port.h"
+#include "../common/Port.h"
 #include "../System.h"
 #include "agbprint.h"
 #ifdef PROFILING

source/vba/gba/GBA.h

@@ -152,9 +152,9 @@ extern struct EmulatedSystem GBASystem;
 #define R14_FIQ  43
 #define SPSR_FIQ 44
 
-#include "../Cheats.h"
+#include "Cheats.h"
-#include "../Globals.h"
+#include "Globals.h"
-#include "../EEprom.h"
+#include "EEprom.h"
-#include "../Flash.h"
+#include "Flash.h"
 
 #endif //VBA_GBA_H

source/vba/gba/GBAGfx.h

@@ -22,9 +22,9 @@
 #define VBA_GFX_H
 
 #include "GBA.h"
-#include "../Globals.h"
+#include "Globals.h"
 
-#include "../Port.h"
+#include "../common/Port.h"
 
 //#define SPRITE_DEBUG
 

source/vba/gba/GBAinline.h

@@ -21,9 +21,9 @@
 #define VBA_GBAinline_H
 
 #include "../System.h"
-#include "../Port.h"
+#include "../common/Port.h"
-#include "../RTC.h"
+#include "RTC.h"
-#include "../Sound.h"
+#include "Sound.h"
 #include "agbprint.h"
 #include "vmmem.h" // Nintendo GC Virtual Memory
 

source/vba/gba/Globals.cpp

@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
 
 #ifdef BKPT_SUPPORT
 int  oldreg[17];

source/vba/gba/Globals.h

@@ -20,7 +20,7 @@
 #ifndef VBA_GLOBALS_H
 #define VBA_GLOBALS_H
 
-#include "agb/GBA.h"
+#include "GBA.h"
 
 #define VERBOSE_SWI                  1
 #define VERBOSE_UNALIGNED_MEMORY     2

source/vba/gba/Mode0.cpp

@@ -16,9 +16,9 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "GBAGfx.h"
 
 void mode0RenderLine()
 {

source/vba/gba/Mode1.cpp

@@ -16,9 +16,9 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "GBAGfx.h"
 
 void mode1RenderLine()
 {

source/vba/gba/Mode2.cpp

@@ -16,9 +16,9 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "GBAGfx.h"
 
 void mode2RenderLine()
 {

source/vba/gba/Mode3.cpp

@@ -16,9 +16,9 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "GBAGfx.h"
 
 void mode3RenderLine()
 {

source/vba/gba/Mode4.cpp

@@ -16,8 +16,8 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
-#include "agb/GBAGfx.h"
+#include "GBAGfx.h"
 #include "Globals.h"
 
 void mode4RenderLine()

source/vba/gba/Mode5.cpp

@@ -16,9 +16,9 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "GBAGfx.h"
 
 void mode5RenderLine()
 {

source/vba/gba/RTC.cpp

@@ -16,12 +16,12 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "System.h"
+#include "../System.h"
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
-#include "Port.h"
+#include "../common/Port.h"
-#include "Util.h"
+#include "../Util.h"
-#include "NLS.h"
+#include "../NLS.h"
 #include "vmmem.h"
 
 #include <time.h>

source/vba/gba/Sound.cpp

@@ -23,13 +23,13 @@
 
 #include "Sound.h"
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
-#include "Util.h"
+#include "../Util.h"
-#include "Port.h"
+#include "../common/Port.h"
 
-#include "dmg/gb_apu/Gb_Apu.h"
+#include "../apu/Gb_Apu.h"
-#include "dmg/gb_apu/Multi_Buffer.h"
+#include "../apu/Multi_Buffer.h"
 
 #define NR10 0x60
 #define NR11 0x62

source/vba/gba/Sram.cpp

@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "Globals.h"
 #include "Flash.h"
 #include "Sram.h"

source/vba/gba/agbprint.cpp

@@ -21,8 +21,8 @@
 
 #include "GBA.h"
 #include "Globals.h"
-#include "Port.h"
+#include "../common/Port.h"
-#include "System.h"
+#include "../System.h"
 
 #define debuggerWriteHalfWord(addr, value) \
   WRITE16LE((u16*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask], (value))

source/vba/gba/armdis.cpp

@@ -21,9 +21,9 @@
 /************************************************************************/
 #include <stdio.h>
 
-#include "System.h"
+#include "../System.h"
-#include "Port.h"
+#include "../common/Port.h"
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "armdis.h"
 #include "elf.h"
 

source/vba/gba/bios.cpp

@@ -20,9 +20,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "agb/GBA.h"
+#include "GBA.h"
 #include "bios.h"
-#include "agb/GBAinline.h"
+#include "GBAinline.h"
 #include "Globals.h"
 
 s16 sineTable[256] = {

source/vba/gba/elf.cpp

@@ -20,10 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "agb/GBA.h"
+#include "GBA.h"
-#include "Port.h"
+#include "../common/Port.h"
 #include "elf.h"
-#include "NLS.h"
+#include "../NLS.h"
 
 #define elfReadMemory(addr) \
   READ32LE((&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]))