diff options
author | Jesse Talavera-Greenberg <jesse@jesse.tg> | 2023-11-25 12:32:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-25 18:32:09 +0100 |
commit | 346dd4006ea1283136095d5c43f602324a095092 (patch) | |
tree | edf04631782bbfcdb48eac79b79aebb11b40f479 /src/NDS.cpp | |
parent | 651b0f680c4531558990a5beb0e638968009dc51 (diff) |
Move all core types into namespaces (#1886)
* 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
Diffstat (limited to 'src/NDS.cpp')
-rw-r--r-- | src/NDS.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/NDS.cpp b/src/NDS.cpp index a216fed..576eb9c 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -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) } } + +}
\ No newline at end of file |