Merge pull request #841 from aap/master

start using CMemoryHeap; also some PS2 define cleanup
2020-11-28 18:52:44 +01:00
parent ad48b9cde0 a8035b6466
commit c57fee38ca
28 changed files with 720 additions and 299 deletions
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -40,7 +40,7 @@
 #include "Sprite2d.h"
 #include "AnimViewer.h"
 #include "Font.h"
-#include "MemoryHeap.h"
+#include "MemoryMgr.h"

 #define MAX_SUBSYSTEMS		(16)