piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 07:39:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move all core types into namespaces (#1886)

Browse Source 
* Reorganize namespaces

- Most types are now moved into the `melonDS` namespace
- Only good chance to do this for a while, since a big refactor is next

* Fix the build
This commit is contained in:
Jesse Talavera-Greenberg
2023-11-25 12:32:09 -05:00
committed by GitHub
parent 651b0f680c
commit 346dd4006e
178 changed files with 529 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NDS.cpp
View File

@ -43,6 +43,8 @@
#include "ARMJIT.h"
#include "ARMJIT_Memory.h"
namespace melonDS
{
using namespace Platform;
namespace NDS
@ -182,8 +184,8 @@ class RTC* RTC;
class Wifi* Wifi;
std::unique_ptr<NDSCart::NDSCartSlot> NDSCartSlot;
std::unique_ptr<GBACart::GBACartSlot> GBACartSlot;
std::unique_ptr<Melon::GPU> GPU;
std::unique_ptr<ARMJIT::ARMJIT> JIT;
std::unique_ptr<melonDS::GPU> GPU;
std::unique_ptr<ARMJIT> JIT;
class AREngine* AREngine;
bool Running;
@ -203,8 +205,8 @@ bool Init()
RegisterEventFunc(Event_Div, 0, DivDone);
RegisterEventFunc(Event_Sqrt, 0, SqrtDone);
JIT = std::make_unique<ARMJIT::ARMJIT>();
GPU = std::make_unique<Melon::GPU>(*JIT);
JIT = std::make_unique<ARMJIT>();
GPU = std::make_unique<melonDS::GPU>(*JIT);
MainRAM = JIT->Memory.GetMainRAM();
SharedWRAM = JIT->Memory.GetSharedWRAM();
@ -4462,3 +4464,5 @@ void ARM7IOWrite32(u32 addr, u32 val)
}
}
}