piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 06:39:58 -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

15
src/NDS.h
View File

@ -34,22 +34,16 @@
// with this enabled, to make sure it doesn't desync
//#define DEBUG_CHECK_DESYNC
namespace melonDS
{
class SPU;
class SPIHost;
class RTC;
class Wifi;
class AREngine;
namespace Melon
{
class GPU;
}
namespace ARMJIT
{
class ARMJIT;
}
namespace NDS
{
@ -273,8 +267,8 @@ extern class RTC* RTC;
extern class Wifi* Wifi;
extern std::unique_ptr<NDSCart::NDSCartSlot> NDSCartSlot;
extern std::unique_ptr<GBACart::GBACartSlot> GBACartSlot;
extern std::unique_ptr<Melon::GPU> GPU;
extern std::unique_ptr<ARMJIT::ARMJIT> JIT;
extern std::unique_ptr<GPU> GPU;
extern std::unique_ptr<ARMJIT> JIT;
extern class AREngine* AREngine;
const u32 ARM7WRAMSize = 0x10000;
@ -394,4 +388,5 @@ void ARM7IOWrite32(u32 addr, u32 val);
}
}
#endif // NDS_H