mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-06-08 03:51:39 +12:00
Merge remote-tracking branch 'upstream/master' into feature/basic-controller-input
This commit is contained in:
commit
acd21c6908
14 changed files with 610 additions and 202 deletions
|
@ -6,6 +6,7 @@
|
|||
#include <glad/gl.h>
|
||||
|
||||
#include "cpu.hpp"
|
||||
#include "crypto/aes_engine.hpp"
|
||||
#include "io_file.hpp"
|
||||
#include "memory.hpp"
|
||||
#include "opengl.hpp"
|
||||
|
@ -20,6 +21,7 @@ class Emulator {
|
|||
GPU gpu;
|
||||
Memory memory;
|
||||
Kernel kernel;
|
||||
Crypto::AESEngine aesEngine;
|
||||
|
||||
SDL_Window* window;
|
||||
SDL_GLContext glContext;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue