diff options
| author |  bunnei | 2015-03-16 20:32:51 -0400 |
|---|---|---|
| committer | bunnei | 2015-03-16 20:32:51 -0400 |
| commit | 6977877665069882caac209cda9b4e4d52a5de22 (patch) | |
| tree | 7da476e6d541c1480050d1a6de91b45f1afc2846 /src/common/common_paths.h | |
| parent | Merge pull request #652 from neobrain/shader_output_fix (diff) | |
| parent | Common: Fix logic for setting EMU_DATA_DIR. (diff) | |
| download | yuzu-6977877665069882caac209cda9b4e4d52a5de22.tar.gz yuzu-6977877665069882caac209cda9b4e4d52a5de22.tar.xz yuzu-6977877665069882caac209cda9b4e4d52a5de22.zip | |
Merge pull request #661 from linkmauve/cleanup
Fix two minor understandability issues in common
Diffstat (limited to 'src/common/common_paths.h')
| -rw-r--r-- | src/common/common_paths.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/common/common_paths.h b/src/common/common_paths.h index eb43d589f..440b06060 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h | |||
| @@ -17,13 +17,12 @@ | |||
| 17 | 17 | ||
| 18 | // The user data dir | 18 | // The user data dir |
| 19 | #define ROOT_DIR "." | 19 | #define ROOT_DIR "." |
| 20 | #ifdef _WIN32 | 20 | #define USERDATA_DIR "user" |
| 21 | #define USERDATA_DIR "user" | 21 | #ifdef USER_DIR |
| 22 | #define EMU_DATA_DIR "Citra Emulator" | 22 | #define EMU_DATA_DIR USER_DIR |
| 23 | #else | 23 | #else |
| 24 | #define USERDATA_DIR "user" | 24 | #ifdef _WIN32 |
| 25 | #ifdef USER_DIR | 25 | #define EMU_DATA_DIR "Citra Emulator" |
| 26 | #define EMU_DATA_DIR USER_DIR | ||
| 27 | #else | 26 | #else |
| 28 | #define EMU_DATA_DIR "citra-emu" | 27 | #define EMU_DATA_DIR "citra-emu" |
| 29 | #endif | 28 | #endif |