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/win | |
| 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/win')
| -rw-r--r-- | src/skel/win/win.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index a437a3b4..1fd959f2 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -98,6 +98,7 @@ static psGlobalType PsGlobal; #include "Sprite2d.h" #include "AnimViewer.h" #include "Font.h" +#include "MemoryMgr.h" VALIDATE_SIZE(psGlobalType, 0x28); @@ -309,7 +310,11 @@ psMouseSetPos(RwV2d *pos) RwMemoryFunctions* psGetMemoryFunctions(void) { +#ifdef USE_CUSTOM_ALLOCATOR + return &memFuncs; +#else return nil; +#endif } /* @@ -2009,6 +2014,10 @@ WinMain(HINSTANCE instance, } #endif +#ifdef USE_CUSTOM_ALLOCATOR + InitMemoryMgr(); +#endif + /* * Initialize the platform independent data. * This will in turn initialize the platform specific data... |