diff options
| author | Nikolay <nickvnuk@gmail.com> | 2020-12-19 17:15:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 17:15:52 +0100 |
| commit | 867133e93d57dba5319bb13abeeb3f73bbaf6ae1 (patch) | |
| tree | e16891b3bd62f38bc959c295ebeca1aa6b9952d7 /src/skel/glfw/glfw.cpp | |
| parent | silly mistake (diff) | |
| parent | fixed cmakelists (diff) | |
| download | re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.gz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.bz2 re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.lz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.xz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.zst re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.zip | |
Diffstat (limited to 'src/skel/glfw/glfw.cpp')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 418f93e4..f039819c 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -40,6 +40,7 @@ #include "Sprite2d.h" #include "AnimViewer.h" #include "Font.h" +#include "MemoryMgr.h" #define MAX_SUBSYSTEMS (16) @@ -279,7 +280,11 @@ psMouseSetPos(RwV2d *pos) RwMemoryFunctions* psGetMemoryFunctions(void) { +#ifdef USE_CUSTOM_ALLOCATOR + return &memFuncs; +#else return nil; +#endif } /* @@ -1521,6 +1526,10 @@ main(int argc, char *argv[]) RwV2d pos; RwInt32 i; +#ifdef USE_CUSTOM_ALLOCATOR + InitMemoryMgr(); +#endif + #ifndef _WIN32 struct sigaction act; act.sa_sigaction = terminateHandler; |