diff options
| author | bunnei <bunneidev@gmail.com> | 2015-03-16 20:32:51 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-03-16 20:32:51 -0400 |
| commit | 6977877665069882caac209cda9b4e4d52a5de22 (patch) | |
| tree | 7da476e6d541c1480050d1a6de91b45f1afc2846 /src/common/common_paths.h | |
| parent | c1f5cb7dd5447acd4533c2b8affc438a94443006 (diff) | |
| parent | 188b4195867e5fcc2ed9f63fa6b10485fd15164f (diff) | |
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 @@ // The user data dir #define ROOT_DIR "." -#ifdef _WIN32 - #define USERDATA_DIR "user" - #define EMU_DATA_DIR "Citra Emulator" +#define USERDATA_DIR "user" +#ifdef USER_DIR + #define EMU_DATA_DIR USER_DIR #else - #define USERDATA_DIR "user" - #ifdef USER_DIR - #define EMU_DATA_DIR USER_DIR + #ifdef _WIN32 + #define EMU_DATA_DIR "Citra Emulator" #else #define EMU_DATA_DIR "citra-emu" #endif |