Fixed MFC

This commit is contained in:
bgk 2009-01-01 17:17:40 +00:00
parent 3047995169
commit 210b97e5ff
34 changed files with 174 additions and 172 deletions

View File

@ -288,75 +288,75 @@
Name="GB"
>
<File
RelativePath="..\..\src\dmg\gb.cpp"
RelativePath="..\..\src\gb\gb.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gb.h"
RelativePath="..\..\src\gb\gb.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbCheats.cpp"
RelativePath="..\..\src\gb\gbCheats.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbCheats.h"
RelativePath="..\..\src\gb\gbCheats.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbCodes.h"
RelativePath="..\..\src\gb\gbCodes.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbCodesCB.h"
RelativePath="..\..\src\gb\gbCodesCB.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbDis.cpp"
RelativePath="..\..\src\gb\gbDis.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbGfx.cpp"
RelativePath="..\..\src\gb\gbGfx.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbGlobals.cpp"
RelativePath="..\..\src\gb\gbGlobals.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbGlobals.h"
RelativePath="..\..\src\gb\gbGlobals.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbMemory.cpp"
RelativePath="..\..\src\gb\gbMemory.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbMemory.h"
RelativePath="..\..\src\gb\gbMemory.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbPrinter.cpp"
RelativePath="..\..\src\gb\gbPrinter.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbPrinter.h"
RelativePath="..\..\src\gb\gbPrinter.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbSGB.cpp"
RelativePath="..\..\src\gb\gbSGB.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbSGB.h"
RelativePath="..\..\src\gb\gbSGB.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gbSound.cpp"
RelativePath="..\..\src\gb\gbSound.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gbSound.h"
RelativePath="..\..\src\gb\gbSound.h"
>
</File>
</Filter>
@ -364,59 +364,59 @@
Name="GB APU"
>
<File
RelativePath="..\..\src\dmg\gb_apu\blargg_common.h"
RelativePath="..\..\src\apu\blargg_common.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\blargg_config.h"
RelativePath="..\..\src\apu\blargg_config.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\blargg_source.h"
RelativePath="..\..\src\apu\blargg_source.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.cpp"
RelativePath="..\..\src\apu\Blip_Buffer.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.h"
RelativePath="..\..\src\apu\Blip_Buffer.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.cpp"
RelativePath="..\..\src\apu\Effects_Buffer.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.h"
RelativePath="..\..\src\apu\Effects_Buffer.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.cpp"
RelativePath="..\..\src\apu\Gb_Apu.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.h"
RelativePath="..\..\src\apu\Gb_Apu.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Gb_Apu_State.cpp"
RelativePath="..\..\src\apu\Gb_Apu_State.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.cpp"
RelativePath="..\..\src\apu\Gb_Oscs.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.h"
RelativePath="..\..\src\apu\Gb_Oscs.h"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.cpp"
RelativePath="..\..\src\apu\Multi_Buffer.cpp"
>
</File>
<File
RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.h"
RelativePath="..\..\src\apu\Multi_Buffer.h"
>
</File>
</Filter>
@ -424,135 +424,135 @@
Name="GBA"
>
<File
RelativePath="..\..\src\agb\agbprint.cpp"
RelativePath="..\..\src\gba\agbprint.cpp"
>
</File>
<File
RelativePath="..\..\src\agb\agbprint.h"
RelativePath="..\..\src\gba\agbprint.h"
>
</File>
<File
RelativePath="..\..\src\bios.cpp"
RelativePath="..\..\src\gba\bios.cpp"
>
</File>
<File
RelativePath="..\..\src\bios.h"
RelativePath="..\..\src\gba\bios.h"
>
</File>
<File
RelativePath="..\..\src\EEprom.cpp"
RelativePath="..\..\src\gba\EEprom.cpp"
>
</File>
<File
RelativePath="..\..\src\EEprom.h"
RelativePath="..\..\src\gba\EEprom.h"
>
</File>
<File
RelativePath="..\..\src\elf.cpp"
RelativePath="..\..\src\gba\elf.cpp"
>
</File>
<File
RelativePath="..\..\src\elf.h"
RelativePath="..\..\src\gba\elf.h"
>
</File>
<File
RelativePath="..\..\src\Flash.cpp"
RelativePath="..\..\src\gba\Flash.cpp"
>
</File>
<File
RelativePath="..\..\src\Flash.h"
RelativePath="..\..\src\gba\Flash.h"
>
</File>
<File
RelativePath="..\..\src\agb\gba-arm.cpp"
RelativePath="..\..\src\gba\gba-arm.cpp"
>
</File>
<File
RelativePath="..\..\src\agb\gba-thumb.cpp"
RelativePath="..\..\src\gba\gba-thumb.cpp"
>
</File>
<File
RelativePath="..\..\src\agb\gba.cpp"
RelativePath="..\..\src\gba\gba.cpp"
>
</File>
<File
RelativePath="..\..\src\agb\gba.h"
RelativePath="..\..\src\gba\gba.h"
>
</File>
<File
RelativePath="..\..\src\agb\GBAcpu.h"
RelativePath="..\..\src\gba\GBAcpu.h"
>
</File>
<File
RelativePath="..\..\src\agb\gbagfx.cpp"
RelativePath="..\..\src\gba\gbagfx.cpp"
>
</File>
<File
RelativePath="..\..\src\agb\gbagfx.h"
RelativePath="..\..\src\gba\gbagfx.h"
>
</File>
<File
RelativePath="..\..\src\agb\gbainline.h"
RelativePath="..\..\src\gba\gbainline.h"
>
</File>
<File
RelativePath="..\..\src\Globals.cpp"
RelativePath="..\..\src\gba\Globals.cpp"
>
</File>
<File
RelativePath="..\..\src\Globals.h"
RelativePath="..\..\src\gba\Globals.h"
>
</File>
<File
RelativePath="..\..\src\Mode0.cpp"
RelativePath="..\..\src\gba\Mode0.cpp"
>
</File>
<File
RelativePath="..\..\src\Mode1.cpp"
RelativePath="..\..\src\gba\Mode1.cpp"
>
</File>
<File
RelativePath="..\..\src\Mode2.cpp"
RelativePath="..\..\src\gba\Mode2.cpp"
>
</File>
<File
RelativePath="..\..\src\Mode3.cpp"
RelativePath="..\..\src\gba\Mode3.cpp"
>
</File>
<File
RelativePath="..\..\src\Mode4.cpp"
RelativePath="..\..\src\gba\Mode4.cpp"
>
</File>
<File
RelativePath="..\..\src\Mode5.cpp"
RelativePath="..\..\src\gba\Mode5.cpp"
>
</File>
<File
RelativePath="..\..\src\remote.cpp"
RelativePath="..\..\src\gba\remote.cpp"
>
</File>
<File
RelativePath="..\..\src\RTC.cpp"
RelativePath="..\..\src\gba\RTC.cpp"
>
</File>
<File
RelativePath="..\..\src\RTC.h"
RelativePath="..\..\src\gba\RTC.h"
>
</File>
<File
RelativePath="..\..\src\Sound.cpp"
RelativePath="..\..\src\gba\Sound.cpp"
>
</File>
<File
RelativePath="..\..\src\Sound.h"
RelativePath="..\..\src\gba\Sound.h"
>
</File>
<File
RelativePath="..\..\src\Sram.cpp"
RelativePath="..\..\src\gba\Sram.cpp"
>
</File>
<File
RelativePath="..\..\src\Sram.h"
RelativePath="..\..\src\gba\Sram.h"
>
</File>
<File
@ -767,35 +767,35 @@
Name="Functionality"
>
<File
RelativePath="..\..\src\armdis.cpp"
RelativePath="..\..\src\gba\armdis.cpp"
>
</File>
<File
RelativePath="..\..\src\armdis.h"
RelativePath="..\..\src\gba\armdis.h"
>
</File>
<File
RelativePath="..\..\src\Cheats.cpp"
RelativePath="..\..\src\gba\Cheats.cpp"
>
</File>
<File
RelativePath="..\..\src\Cheats.h"
RelativePath="..\..\src\gba\Cheats.h"
>
</File>
<File
RelativePath="..\..\src\CheatSearch.cpp"
RelativePath="..\..\src\gba\CheatSearch.cpp"
>
</File>
<File
RelativePath="..\..\src\CheatSearch.h"
RelativePath="..\..\src\gba\CheatSearch.h"
>
</File>
<File
RelativePath="..\..\src\memgzio.c"
RelativePath="..\..\src\common\memgzio.c"
>
</File>
<File
RelativePath="..\..\src\memgzio.h"
RelativePath="..\..\src\common\memgzio.h"
>
</File>
<File
@ -803,15 +803,15 @@
>
</File>
<File
RelativePath="..\..\src\Patch.cpp"
RelativePath="..\..\src\common\Patch.cpp"
>
</File>
<File
RelativePath="..\..\src\Patch.h"
RelativePath="..\..\src\common\Patch.h"
>
</File>
<File
RelativePath="..\..\src\Port.h"
RelativePath="..\..\src\common\Port.h"
>
</File>
<File
@ -907,11 +907,11 @@
Name="Linking"
>
<File
RelativePath="..\..\src\agb\gbalink.cpp"
RelativePath="..\..\src\gba\gbalink.cpp"
>
</File>
<File
RelativePath="..\..\src\agb\gbalink.h"
RelativePath="..\..\src\gba\gbalink.h"
>
</File>
<File

View File

@ -3,7 +3,7 @@
#include "GBA.h"
#include <stdio.h>
#include "../win32/stdafx.h"
#include "../port.h"
#include "../common/port.h"
#include "GBALink.h"
#include "../win32/vba.h"
#include "../win32/MainWnd.h"

View File

@ -2,6 +2,7 @@
#define GLOBALS_H
#include "../common/Types.h"
#include "GBA.h"
#define VERBOSE_SWI 1
#define VERBOSE_UNALIGNED_MEMORY 2

View File

@ -12,10 +12,10 @@
#include "FullscreenSettings.h"
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../Util.h"
#include "../dmg/gbGlobals.h"
#include "../gb/gbGlobals.h"
#include <memory.h>
#include <cassert>

View File

@ -7,9 +7,9 @@
// Internals
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../Sound.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../gba/Sound.h"
#include "../common/SoundDriver.h"
// DirectSound8

View File

@ -3,9 +3,9 @@
#include "Disassemble.h"
#include "../System.h"
#include "../armdis.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/armdis.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -2,7 +2,7 @@
#include "vba.h"
#include "ExportGSASnapshot.h"
#include "../agb/GBA.h"
#include "../gba/GBA.h"
#include "../NLS.h"
#ifdef _DEBUG

View File

@ -3,10 +3,10 @@
#include "GBACheats.h"
#include "../System.h"
#include "../Cheats.h"
#include "../CheatSearch.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/Cheats.h"
#include "../gba/CheatSearch.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "Reg.h"
#include "StringTokenizer.h"

View File

@ -6,9 +6,9 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../CheatSearch.h"
#include "../dmg/gbCheats.h"
#include "../dmg/gbGlobals.h"
#include "../gba/CheatSearch.h"
#include "../gb/gbCheats.h"
#include "../gb/gbGlobals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -3,8 +3,8 @@
#include "GBDisassemble.h"
#include "../System.h"
#include "../dmg/GB.h"
#include "../dmg/gbGlobals.h"
#include "../gb/GB.h"
#include "../gb/gbGlobals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -8,7 +8,7 @@
#include "../System.h"
#include "../NLS.h"
#include "../Util.h"
#include "../dmg/gbGlobals.h"
#include "../gb/gbGlobals.h"
extern "C" {
#include <png.h>

View File

@ -7,7 +7,7 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../dmg/gbGlobals.h"
#include "../gb/gbGlobals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -8,7 +8,7 @@
#include "../System.h"
#include "../NLS.h"
#include "../Util.h"
#include "../dmg/gbGlobals.h"
#include "../gb/gbGlobals.h"
extern "C" {
#include <png.h>

View File

@ -5,7 +5,7 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../dmg/gbGlobals.h"
#include "../gb/gbGlobals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -8,7 +8,7 @@
#include "../System.h"
#include "../NLS.h"
#include "../Util.h"
#include "../dmg/gbGlobals.h"
#include "../gb/gbGlobals.h"
extern "C" {
#include <png.h>

View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "vba.h"
#include "GameOverrides.h"
#include "../agb/GBA.h"
#include "../gba/GBA.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -3,9 +3,9 @@
#include "IOViewer.h"
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../agb/GBAinline.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../gba/GBAinline.h"
#include "IOViewerRegs.h"
#ifdef _DEBUG

View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "vba.h"
#include "LinkOptions.h"
#include "../agb/GBALink.h"
#include "../gba/GBALink.h"
extern int lspeed;
extern lserver ls;

View File

@ -4,7 +4,7 @@
#include "FileDlg.h"
#include "Logging.h"
#include "../Globals.h"
#include "../gba/Globals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -11,19 +11,20 @@
#include "../System.h"
#include "../AutoBuild.h"
#include "../cheatSearch.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../Flash.h"
#include "../Globals.h"
#include "../dmg/GB.h"
#include "../dmg/gbSound.h"
#include "../dmg/gbCheats.h"
#include "../dmg/gbGlobals.h"
#include "../RTC.h"
#include "../Sound.h"
#include "../gba/cheatSearch.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../gba/Flash.h"
#include "../gba/Globals.h"
#include "../gb/GB.h"
#include "../gb/gbSound.h"
#include "../gb/gbCheats.h"
#include "../gb/gbGlobals.h"
#include "../gba/RTC.h"
#include "../gba/Sound.h"
#include "../Util.h"
#include "../agb/GBALink.h"
#include "../gba/GBALink.h"
#include "../common/Patch.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@ -498,7 +499,7 @@ bool MainWnd::FileRun()
if(theApp.autoPatch && !patchName.IsEmpty()) {
int size = gbRomSize;
utilApplyIPS(patchName, &gbRom, &size);
applyPatch(patchName, &gbRom, &size);
if(size != gbRomSize) {
extern bool gbUpdateSizes();
gbUpdateSizes();
@ -565,7 +566,7 @@ bool MainWnd::FileRun()
if(theApp.autoPatch && !patchName.IsEmpty()) {
int size = 0x2000000;
utilApplyIPS(patchName, &rom, &size);
applyPatch(patchName, &rom, &size);
if(size != 0x2000000) {
CPUReset();
}

View File

@ -7,9 +7,9 @@
#include "Reg.h"
#include "WinResUtil.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../dmg/gbCheats.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../gb/gbCheats.h"
extern int emulating;

View File

@ -9,13 +9,13 @@
#include "WinResUtil.h"
#include "Logging.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../NLS.h"
#include "../Sound.h"
#include "../dmg/GB.h"
#include "../dmg/gbCheats.h"
#include "../dmg/gbGlobals.h"
#include "../gba/Sound.h"
#include "../gb/GB.h"
#include "../gb/gbCheats.h"
#include "../gb/gbGlobals.h"
extern void remoteCleanUp();
extern void InterframeCleanup();

View File

@ -21,15 +21,15 @@
#include "AudioCoreSettingsDlg.h"
#include "../System.h"
#include "../agb/agbprint.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../Sound.h"
#include "../dmg/GB.h"
#include "../dmg/gbGlobals.h"
#include "../dmg/gbPrinter.h"
#include "../dmg/gbSound.h"
#include "../agb/GBALink.h"
#include "../gba/agbprint.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../gba/Sound.h"
#include "../gb/GB.h"
#include "../gb/gbGlobals.h"
#include "../gb/gbPrinter.h"
#include "../gb/gbSound.h"
#include "../gba/GBALink.h"
#include <tchar.h>

View File

@ -23,9 +23,9 @@
#include "WinResUtil.h"
#include "Logging.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../Sound.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../gba/Sound.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -6,8 +6,8 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../NLS.h"
#include "../Util.h"

View File

@ -7,8 +7,8 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -6,8 +6,8 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../NLS.h"
#include "../Util.h"

View File

@ -18,8 +18,8 @@
#include <windows.h> // for 'Sleep' function
// Internals
#include "../Sound.h"
#include "../Globals.h" // for 'speedup' and 'synchronize'
#include "../gba/Sound.h"
#include "../gba/Globals.h" // for 'speedup' and 'synchronize'
// Debug
#include <assert.h>

View File

@ -12,11 +12,11 @@
// Internals
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../Util.h"
#include "../dmg/gbGlobals.h"
#include "..\memgzio.h"
#include "../gb/gbGlobals.h"
#include "../common/memgzio.h"
//Math
#include <cmath>

View File

@ -5,8 +5,8 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#ifdef _DEBUG
#define new DEBUG_NEW

View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\agb\GBALink.h"
#include "..\gba\GBALink.h"
static char buffer[2048];
static HKEY vbKey = NULL;

View File

@ -6,8 +6,8 @@
#include "WinResUtil.h"
#include "../System.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../NLS.h"
#include "../Util.h"

View File

@ -20,21 +20,21 @@
#include "protect.h"
#include "../System.h"
#include "../agb/agbprint.h"
#include "../cheatSearch.h"
#include "../agb/GBA.h"
#include "../Globals.h"
#include "../RTC.h"
#include "../Sound.h"
#include "../gba/agbprint.h"
#include "../gba/cheatSearch.h"
#include "../gba/GBA.h"
#include "../gba/Globals.h"
#include "../gba/RTC.h"
#include "../gba/Sound.h"
#include "../Util.h"
#include "../dmg/gbGlobals.h"
#include "../dmg/gbPrinter.h"
#include "../dmg/gbSound.h"
#include "../gb/gbGlobals.h"
#include "../gb/gbPrinter.h"
#include "../gb/gbSound.h"
#include "../common/SoundDriver.h"
/* Link
---------------------*/
#include "../agb/GBALink.h"
#include "../gba/GBALink.h"
/* ---------------- */
extern void Pixelate(u8*,u32,u8*,u8*,u32,int,int);

View File

@ -11,7 +11,7 @@
// Internals
#include "../System.h" // for systemMessage()
#include "../Globals.h"
#include "../gba/Globals.h"
// Synchronization Event