diff options
| author | 2013-09-08 13:17:27 -0400 | |
|---|---|---|
| committer | 2013-09-08 13:17:27 -0400 | |
| commit | 6847033b27cb07c566d75fb291131910a4296702 (patch) | |
| tree | 83675e98f19a6dc597c90a139c70b0a18d713c9b /src/common | |
| parent | start of 3DS memory map (diff) | |
| download | yuzu-6847033b27cb07c566d75fb291131910a4296702.tar.gz yuzu-6847033b27cb07c566d75fb291131910a4296702.tar.xz yuzu-6847033b27cb07c566d75fb291131910a4296702.zip | |
updated common paths
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/src/common.h | 1 | ||||
| -rw-r--r-- | src/common/src/common_paths.h | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/common/src/common.h b/src/common/src/common.h index f95d58074..b61e77686 100644 --- a/src/common/src/common.h +++ b/src/common/src/common.h | |||
| @@ -47,6 +47,7 @@ private: | |||
| 47 | #include "common_types.h" | 47 | #include "common_types.h" |
| 48 | #include "msg_handler.h" | 48 | #include "msg_handler.h" |
| 49 | #include "common_funcs.h" | 49 | #include "common_funcs.h" |
| 50 | #include "common_paths.h" | ||
| 50 | 51 | ||
| 51 | #ifdef __APPLE__ | 52 | #ifdef __APPLE__ |
| 52 | // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. | 53 | // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. |
diff --git a/src/common/src/common_paths.h b/src/common/src/common_paths.h index 9af93ab74..b38ae6903 100644 --- a/src/common/src/common_paths.h +++ b/src/common/src/common_paths.h | |||
| @@ -12,17 +12,19 @@ | |||
| 12 | #define DIR_SEP "/" | 12 | #define DIR_SEP "/" |
| 13 | #define DIR_SEP_CHR '/' | 13 | #define DIR_SEP_CHR '/' |
| 14 | 14 | ||
| 15 | #define MAX_PATH 255 | ||
| 16 | |||
| 15 | // The user data dir | 17 | // The user data dir |
| 16 | #define ROOT_DIR "." | 18 | #define ROOT_DIR "." |
| 17 | #ifdef _WIN32 | 19 | #ifdef _WIN32 |
| 18 | #define USERDATA_DIR "user" | 20 | #define USERDATA_DIR "user" |
| 19 | #define DOLPHIN_DATA_DIR "akiru" | 21 | #define EMU_DATA_DIR "emu" |
| 20 | #else | 22 | #else |
| 21 | #define USERDATA_DIR "user" | 23 | #define USERDATA_DIR "user" |
| 22 | #ifdef USER_DIR | 24 | #ifdef USER_DIR |
| 23 | #define DOLPHIN_DATA_DIR USER_DIR | 25 | #define EMU_DATA_DIR USER_DIR |
| 24 | #else | 26 | #else |
| 25 | #define DOLPHIN_DATA_DIR ".akiru" | 27 | #define EMU_DATA_DIR ".akiru" |
| 26 | #endif | 28 | #endif |
| 27 | #endif | 29 | #endif |
| 28 | 30 | ||
| @@ -61,7 +63,7 @@ | |||
| 61 | 63 | ||
| 62 | // Filenames | 64 | // Filenames |
| 63 | // Files in the directory returned by GetUserPath(D_CONFIG_IDX) | 65 | // Files in the directory returned by GetUserPath(D_CONFIG_IDX) |
| 64 | #define AKIRU_CONFIG "akiru.ini" | 66 | #define EMU_CONFIG "emu.ini" |
| 65 | #define DEBUGGER_CONFIG "debugger.ini" | 67 | #define DEBUGGER_CONFIG "debugger.ini" |
| 66 | #define LOGGER_CONFIG "logger.ini" | 68 | #define LOGGER_CONFIG "logger.ini" |
| 67 | 69 | ||