From 96c0a729bd06af21f08c2b581740d6b10cfb49fc Mon Sep 17 00:00:00 2001 From: dborth Date: Thu, 8 Jan 2009 07:35:44 +0000 Subject: [PATCH] update includes to match new structure --- Makefile.gc | 4 ++-- Makefile.wii | 3 ++- source/vba/Util.cpp | 12 ++++++------ source/vba/common/Patch.cpp | 2 +- source/vba/common/memgzio.c | 5 +++-- source/vba/common/memgzio.h | 15 ++++++++++++++- source/vba/gb/gbGfx.cpp | 2 +- source/vba/gb/gbGlobals.cpp | 2 +- source/vba/gb/gbMemory.cpp | 4 ++-- source/vba/gb/gbPrinter.cpp | 2 +- source/vba/gb/gbSGB.cpp | 4 ++-- source/vba/gb/gbSound.cpp | 16 ++++++++-------- source/vba/gba/Cheats.cpp | 8 ++++---- source/vba/gba/EEprom.cpp | 4 ++-- source/vba/gba/Flash.cpp | 4 ++-- source/vba/gba/GBA-arm.cpp | 18 +++++++++--------- source/vba/gba/GBA-thumb.cpp | 18 +++++++++--------- source/vba/gba/GBA.cpp | 18 +++++++++--------- source/vba/gba/GBA.h | 8 ++++---- source/vba/gba/GBAGfx.h | 4 ++-- source/vba/gba/GBAinline.h | 6 +++--- source/vba/gba/Globals.cpp | 2 +- source/vba/gba/Globals.h | 2 +- source/vba/gba/Mode0.cpp | 4 ++-- source/vba/gba/Mode1.cpp | 4 ++-- source/vba/gba/Mode2.cpp | 4 ++-- source/vba/gba/Mode3.cpp | 4 ++-- source/vba/gba/Mode4.cpp | 4 ++-- source/vba/gba/Mode5.cpp | 4 ++-- source/vba/gba/RTC.cpp | 10 +++++----- source/vba/gba/Sound.cpp | 10 +++++----- source/vba/gba/Sram.cpp | 2 +- source/vba/gba/agbprint.cpp | 4 ++-- source/vba/gba/armdis.cpp | 6 +++--- source/vba/gba/bios.cpp | 4 ++-- source/vba/gba/elf.cpp | 6 +++--- 36 files changed, 122 insertions(+), 107 deletions(-) diff --git a/Makefile.gc b/Makefile.gc index 19c0b2c..d855c87 100644 --- a/Makefile.gc +++ b/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: diff --git a/Makefile.wii b/Makefile.wii index 14f6e95..49edc74 100644 --- a/Makefile.wii +++ b/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 diff --git a/source/vba/Util.cpp b/source/vba/Util.cpp index a65314c..38d6c05 100644 --- a/source/vba/Util.cpp +++ b/source/vba/Util.cpp @@ -30,15 +30,15 @@ extern "C" { #include "System.h" #include "NLS.h" #include "Util.h" -#include "Flash.h" -#include "agb/GBA.h" -#include "Globals.h" -#include "RTC.h" -#include "Port.h" +#include "gba/Flash.h" +#include "gba/GBA.h" +#include "gba/Globals.h" +#include "gba/RTC.h" +#include "common/Port.h" #include "unzip.h" extern "C" { -#include "memgzio.h" +#include "common/memgzio.h" } #ifndef _MSC_VER diff --git a/source/vba/common/Patch.cpp b/source/vba/common/Patch.cpp index 44081f3..9be05cb 100644 --- a/source/vba/common/Patch.cpp +++ b/source/vba/common/Patch.cpp @@ -21,7 +21,7 @@ #include #include -#include "System.h" +#include "../System.h" #include "memfile.h" /* diff --git a/source/vba/common/memgzio.c b/source/vba/common/memgzio.c index eef6b2c..f81874a 100644 --- a/source/vba/common/memgzio.c +++ b/source/vba/common/memgzio.c @@ -14,7 +14,8 @@ #include #include #include - +#include +#include #include "memgzio.h" /*struct internal_state {int dummy;};*/ /* for buggy compilers */ @@ -670,7 +671,7 @@ int flush; if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; /* deflate has finished flushing only when it hasn't used up - * all the available space in the output buffer: + * all the available space in the output buffer: */ done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); diff --git a/source/vba/common/memgzio.h b/source/vba/common/memgzio.h index 2ca74cb..69e1a7c 100644 --- a/source/vba/common/memgzio.h +++ b/source/vba/common/memgzio.h @@ -11,9 +11,22 @@ #ifndef HAVE_ZUTIL_H #include "../win32/include/zlib/zutil.h" #else -#include +#include #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); diff --git a/source/vba/gb/gbGfx.cpp b/source/vba/gb/gbGfx.cpp index e3e4fac..a2e4bef 100644 --- a/source/vba/gb/gbGfx.cpp +++ b/source/vba/gb/gbGfx.cpp @@ -18,7 +18,7 @@ #include -#include "../agb/GBA.h" +#include "../gba/GBA.h" #include "gbGlobals.h" #include "gbSGB.h" diff --git a/source/vba/gb/gbGlobals.cpp b/source/vba/gb/gbGlobals.cpp index 0bbc3ec..82c253a 100644 --- a/source/vba/gb/gbGlobals.cpp +++ b/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]; diff --git a/source/vba/gb/gbMemory.cpp b/source/vba/gb/gbMemory.cpp index 7e0fcc5..f9d8e00 100644 --- a/source/vba/gb/gbMemory.cpp +++ b/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 "../Port.h" +#include "../gba/GBA.h" +#include "../common/Port.h" #include "gbGlobals.h" #include "gbMemory.h" #include "gb.h" diff --git a/source/vba/gb/gbPrinter.cpp b/source/vba/gb/gbPrinter.cpp index 3612ad0..0d7f859 100644 --- a/source/vba/gb/gbPrinter.cpp +++ b/source/vba/gb/gbPrinter.cpp @@ -18,7 +18,7 @@ #include #include -#include "../agb/GBA.h" +#include "../gba/GBA.h" u8 gbPrinterStatus = 0; int gbPrinterState = 0; diff --git a/source/vba/gb/gbSGB.cpp b/source/vba/gb/gbSGB.cpp index 551837d..52c8e42 100644 --- a/source/vba/gb/gbSGB.cpp +++ b/source/vba/gb/gbSGB.cpp @@ -20,7 +20,7 @@ #include #include "../System.h" -#include "../Port.h" +#include "../common/Port.h" #include "../Util.h" #include "gb.h" #include "gbGlobals.h" @@ -236,7 +236,7 @@ void gbSgbDrawBorderTile(int x, int y, int tile, int attr) u8 d = *tileAddress2++; - + u8 yyy; if(!flipY) yyy = yy; diff --git a/source/vba/gb/gbSound.cpp b/source/vba/gb/gbSound.cpp index 5826b59..0aba219 100644 --- a/source/vba/gb/gbSound.cpp +++ b/source/vba/gb/gbSound.cpp @@ -20,13 +20,13 @@ #include -#include "../Sound.h" +#include "../gba/Sound.h" #include "../Util.h" #include "gbGlobals.h" #include "gbSound.h" -#include "gb_apu/Gb_Apu.h" -#include "gb_apu/Effects_Buffer.h" +#include "../apu/Gb_Apu.h" +#include "../apu/Effects_Buffer.h" extern int gbHardware; @@ -132,7 +132,7 @@ void gbSoundTick() if ( memcmp( &gb_effects_config_current, &gb_effects_config, sizeof gb_effects_config ) || soundGetEnable() != prevSoundEnable ) apply_effects(); - + if ( soundVolume_ != soundGetVolume() ) apply_volume(); } @@ -147,7 +147,7 @@ static void reset_apu() mode = Gb_Apu::mode_agb; gb_apu->reset( mode ); gb_apu->reduce_clicks( declicking ); - + if ( stereo_buffer ) stereo_buffer->clear(); @@ -387,7 +387,7 @@ static void gbSoundReadGameOld(int version,gzFile gzFile) state.apu.regs [nr52] = 0x80; // power on return; } - + // Load state utilReadData( gzFile, gbsound_format ); @@ -420,7 +420,7 @@ static void gbSoundReadGameOld(int version,gzFile gzFile) static variable_desc gb_state [] = { LOAD( int, state.version ), // room_for_expansion will be used by later versions - + // APU LOAD( u8 [0x40], state.apu.regs ), // last values written to registers and wave RAM (both banks) LOAD( int, state.apu.frame_time ), // clocks until next frame sequencer action @@ -466,7 +466,7 @@ void gbSoundReadGame( int version, gzFile in ) // Prepare APU and default state reset_apu(); gb_apu->save_state( &state.apu ); - + if ( version > 11 ) utilReadData( in, gb_state ); else diff --git a/source/vba/gba/Cheats.cpp b/source/vba/gba/Cheats.cpp index 6947f59..7af0169 100644 --- a/source/vba/gba/Cheats.cpp +++ b/source/vba/gba/Cheats.cpp @@ -20,12 +20,12 @@ #include #include -#include "agb/GBA.h" -#include "agb/GBAinline.h" +#include "GBA.h" +#include "GBAinline.h" #include "Cheats.h" #include "Globals.h" -#include "NLS.h" -#include "Util.h" +#include "../NLS.h" +#include "../Util.h" /** * Gameshark code types: (based on AR v1.0) diff --git a/source/vba/gba/EEprom.cpp b/source/vba/gba/EEprom.cpp index fd9b006..9733182 100644 --- a/source/vba/gba/EEprom.cpp +++ b/source/vba/gba/EEprom.cpp @@ -17,9 +17,9 @@ // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "agb/GBA.h" +#include "GBA.h" #include "EEprom.h" -#include "Util.h" +#include "../Util.h" extern int cpuDmaCount; diff --git a/source/vba/gba/Flash.cpp b/source/vba/gba/Flash.cpp index 61416d5..5dd0545 100644 --- a/source/vba/gba/Flash.cpp +++ b/source/vba/gba/Flash.cpp @@ -18,11 +18,11 @@ #include #include -#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 diff --git a/source/vba/gba/GBA-arm.cpp b/source/vba/gba/GBA-arm.cpp index 4e320aa..119d5c4 100644 --- a/source/vba/gba/GBA-arm.cpp +++ b/source/vba/gba/GBA-arm.cpp @@ -25,17 +25,17 @@ #include "GBA.h" #include "GBAcpu.h" #include "GBAinline.h" -#include "../Globals.h" -#include "../EEprom.h" -#include "../Flash.h" -#include "../Sound.h" -#include "../Sram.h" -#include "../bios.h" -#include "../Cheats.h" +#include "Globals.h" +#include "EEprom.h" +#include "Flash.h" +#include "Sound.h" +#include "Sram.h" +#include "bios.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 diff --git a/source/vba/gba/GBA-thumb.cpp b/source/vba/gba/GBA-thumb.cpp index e52f2a8..74f3adc 100644 --- a/source/vba/gba/GBA-thumb.cpp +++ b/source/vba/gba/GBA-thumb.cpp @@ -27,17 +27,17 @@ #include "GBA.h" #include "GBAcpu.h" #include "GBAinline.h" -#include "../Globals.h" -#include "../EEprom.h" -#include "../Flash.h" -#include "../Sound.h" -#include "../Sram.h" -#include "../bios.h" -#include "../Cheats.h" +#include "Globals.h" +#include "EEprom.h" +#include "Flash.h" +#include "Sound.h" +#include "Sram.h" +#include "bios.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 diff --git a/source/vba/gba/GBA.cpp b/source/vba/gba/GBA.cpp index 5e5febd..a268bb6 100644 --- a/source/vba/gba/GBA.cpp +++ b/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 "../Flash.h" -#include "../Sound.h" -#include "../Sram.h" -#include "../bios.h" -#include "../Cheats.h" +#include "EEprom.h" +#include "Flash.h" +#include "Sound.h" +#include "Sram.h" +#include "bios.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 diff --git a/source/vba/gba/GBA.h b/source/vba/gba/GBA.h index a1c04a0..eb0e5e3 100644 --- a/source/vba/gba/GBA.h +++ b/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 "../Globals.h" -#include "../EEprom.h" -#include "../Flash.h" +#include "Cheats.h" +#include "Globals.h" +#include "EEprom.h" +#include "Flash.h" #endif //VBA_GBA_H diff --git a/source/vba/gba/GBAGfx.h b/source/vba/gba/GBAGfx.h index 73f1dd4..9b9b614 100644 --- a/source/vba/gba/GBAGfx.h +++ b/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 diff --git a/source/vba/gba/GBAinline.h b/source/vba/gba/GBAinline.h index c51acfd..938ee47 100644 --- a/source/vba/gba/GBAinline.h +++ b/source/vba/gba/GBAinline.h @@ -21,9 +21,9 @@ #define VBA_GBAinline_H #include "../System.h" -#include "../Port.h" -#include "../RTC.h" -#include "../Sound.h" +#include "../common/Port.h" +#include "RTC.h" +#include "Sound.h" #include "agbprint.h" #include "vmmem.h" // Nintendo GC Virtual Memory diff --git a/source/vba/gba/Globals.cpp b/source/vba/gba/Globals.cpp index 5d2433c..655cbed 100644 --- a/source/vba/gba/Globals.cpp +++ b/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]; diff --git a/source/vba/gba/Globals.h b/source/vba/gba/Globals.h index 8439848..c559f4d 100644 --- a/source/vba/gba/Globals.h +++ b/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 diff --git a/source/vba/gba/Mode0.cpp b/source/vba/gba/Mode0.cpp index 8e82d94..5d08721 100644 --- a/source/vba/gba/Mode0.cpp +++ b/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() { diff --git a/source/vba/gba/Mode1.cpp b/source/vba/gba/Mode1.cpp index 9da41fc..2f95ec8 100644 --- a/source/vba/gba/Mode1.cpp +++ b/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() { diff --git a/source/vba/gba/Mode2.cpp b/source/vba/gba/Mode2.cpp index 9b3bb52..b4ecb55 100644 --- a/source/vba/gba/Mode2.cpp +++ b/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() { diff --git a/source/vba/gba/Mode3.cpp b/source/vba/gba/Mode3.cpp index 74766c6..0efe693 100644 --- a/source/vba/gba/Mode3.cpp +++ b/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() { diff --git a/source/vba/gba/Mode4.cpp b/source/vba/gba/Mode4.cpp index 957592c..085b09e 100644 --- a/source/vba/gba/Mode4.cpp +++ b/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 "agb/GBAGfx.h" +#include "GBA.h" +#include "GBAGfx.h" #include "Globals.h" void mode4RenderLine() diff --git a/source/vba/gba/Mode5.cpp b/source/vba/gba/Mode5.cpp index 2b99661..11d9cc7 100644 --- a/source/vba/gba/Mode5.cpp +++ b/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() { diff --git a/source/vba/gba/RTC.cpp b/source/vba/gba/RTC.cpp index 93d139a..7672d92 100644 --- a/source/vba/gba/RTC.cpp +++ b/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 "agb/GBA.h" +#include "../System.h" +#include "GBA.h" #include "Globals.h" -#include "Port.h" -#include "Util.h" -#include "NLS.h" +#include "../common/Port.h" +#include "../Util.h" +#include "../NLS.h" #include "vmmem.h" #include diff --git a/source/vba/gba/Sound.cpp b/source/vba/gba/Sound.cpp index b2584f9..4b6e689 100644 --- a/source/vba/gba/Sound.cpp +++ b/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 "Port.h" +#include "../Util.h" +#include "../common/Port.h" -#include "dmg/gb_apu/Gb_Apu.h" -#include "dmg/gb_apu/Multi_Buffer.h" +#include "../apu/Gb_Apu.h" +#include "../apu/Multi_Buffer.h" #define NR10 0x60 #define NR11 0x62 diff --git a/source/vba/gba/Sram.cpp b/source/vba/gba/Sram.cpp index dae6be3..2b59d86 100644 --- a/source/vba/gba/Sram.cpp +++ b/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" diff --git a/source/vba/gba/agbprint.cpp b/source/vba/gba/agbprint.cpp index 7104318..9b2725e 100644 --- a/source/vba/gba/agbprint.cpp +++ b/source/vba/gba/agbprint.cpp @@ -21,8 +21,8 @@ #include "GBA.h" #include "Globals.h" -#include "Port.h" -#include "System.h" +#include "../common/Port.h" +#include "../System.h" #define debuggerWriteHalfWord(addr, value) \ WRITE16LE((u16*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask], (value)) diff --git a/source/vba/gba/armdis.cpp b/source/vba/gba/armdis.cpp index dde2b2c..5f9cddc 100644 --- a/source/vba/gba/armdis.cpp +++ b/source/vba/gba/armdis.cpp @@ -21,9 +21,9 @@ /************************************************************************/ #include -#include "System.h" -#include "Port.h" -#include "agb/GBA.h" +#include "../System.h" +#include "../common/Port.h" +#include "GBA.h" #include "armdis.h" #include "elf.h" diff --git a/source/vba/gba/bios.cpp b/source/vba/gba/bios.cpp index 3e8bf3f..cfdc59f 100644 --- a/source/vba/gba/bios.cpp +++ b/source/vba/gba/bios.cpp @@ -20,9 +20,9 @@ #include #include -#include "agb/GBA.h" +#include "GBA.h" #include "bios.h" -#include "agb/GBAinline.h" +#include "GBAinline.h" #include "Globals.h" s16 sineTable[256] = { diff --git a/source/vba/gba/elf.cpp b/source/vba/gba/elf.cpp index da7e418..7f4c5f1 100644 --- a/source/vba/gba/elf.cpp +++ b/source/vba/gba/elf.cpp @@ -20,10 +20,10 @@ #include #include -#include "agb/GBA.h" -#include "Port.h" +#include "GBA.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]))