diff options
| author | Vlad Firoiu <vladfi2@gmail.com> | 2019-05-03 20:46:37 +0100 |
|---|---|---|
| committer | Vlad Firoiu <vladfi2@gmail.com> | 2019-05-05 21:43:45 +0100 |
| commit | f4d950f4e243c34136ca1fda7ae46995c6272fc5 (patch) | |
| tree | e7b9faa8df464eef262972d973f2c4399e917186 /Source/Core/Common | |
| parent | d531fe6a1d4c141820e295a18537079f67a063e3 (diff) | |
Revert "Core: Remove MemoryWatcher"
This reverts commit 0c02e77eee0a12b178b11676ca548aeb1cbb7116.
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/CommonPaths.h | 5 | ||||
| -rw-r--r-- | Source/Core/Common/FileUtil.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Common/FileUtil.h | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 97213f6448..7137dab3f6 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -63,6 +63,7 @@ #define STYLES_DIR "Styles" #define ANAGLYPH_DIR "Anaglyph" #define PIPES_DIR "Pipes" +#define MEMORYWATCHER_DIR "MemoryWatcher" #define WFSROOT_DIR "WFS" #define BACKUP_DIR "Backup" #define RESOURCEPACK_DIR "ResourcePacks" @@ -95,6 +96,10 @@ #define ARAM_DUMP "aram.raw" #define FAKEVMEM_DUMP "fakevmem.raw" +// Files in the directory returned by GetUserPath(D_MEMORYWATCHER_IDX) +#define MEMORYWATCHER_LOCATIONS "Locations.txt" +#define MEMORYWATCHER_SOCKET "MemoryWatcher" + // Sys files #define TOTALDB "totaldb.dsy" diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 72d441906e..7030c9dc25 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -801,6 +801,12 @@ static void RebuildUserDirectories(unsigned int dir_index) s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM; s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD; + s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP; + s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] = + s_user_paths[D_MEMORYWATCHER_IDX] + MEMORYWATCHER_LOCATIONS; + s_user_paths[F_MEMORYWATCHERSOCKET_IDX] = + s_user_paths[D_MEMORYWATCHER_IDX] + MEMORYWATCHER_SOCKET; + // The shader cache has moved to the cache directory, so remove the old one. // TODO: remove that someday. File::DeleteDirRecursively(s_user_paths[D_USER_IDX] + SHADERCACHE_LEGACY_DIR DIR_SEP); diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index dadee2ae23..71e9709da3 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -48,6 +48,7 @@ enum D_THEMES_IDX, D_STYLES_IDX, D_PIPES_IDX, + D_MEMORYWATCHER_IDX, D_WFSROOT_IDX, D_BACKUP_IDX, D_RESOURCEPACK_IDX, @@ -64,6 +65,8 @@ enum F_ARAMDUMP_IDX, F_FAKEVMEMDUMP_IDX, F_GCSRAM_IDX, + F_MEMORYWATCHERLOCATIONS_IDX, + F_MEMORYWATCHERSOCKET_IDX, F_WIISDCARD_IDX, NUM_PATH_INDICES }; |