diff options
| author | bunnei <bunneidev@gmail.com> | 2015-03-17 01:32:51 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-03-17 01:32:51 +0100 |
| commit | 6977877665069882caac209cda9b4e4d52a5de22 (patch) | |
| tree | 7da476e6d541c1480050d1a6de91b45f1afc2846 | |
| 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 yuzu-6977877665069882caac209cda9b4e4d52a5de22.tar.gz yuzu-6977877665069882caac209cda9b4e4d52a5de22.tar.bz2 yuzu-6977877665069882caac209cda9b4e4d52a5de22.tar.lz yuzu-6977877665069882caac209cda9b4e4d52a5de22.tar.xz yuzu-6977877665069882caac209cda9b4e4d52a5de22.tar.zst yuzu-6977877665069882caac209cda9b4e4d52a5de22.zip | |
| -rw-r--r-- | src/common/common_paths.h | 11 | ||||
| -rw-r--r-- | src/common/platform.h | 6 |
2 files changed, 6 insertions, 11 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 diff --git a/src/common/platform.h b/src/common/platform.h index ba1109c9f..e27d6e31f 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -83,7 +83,7 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) { } #endif -#else +#else // EMU_PLATFORM != PLATFORM_WINDOWS #define EMU_FASTCALL __attribute__((fastcall)) #define __stdcall @@ -92,10 +92,6 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) { #define BOOL bool #define DWORD u32 -#endif - -#if EMU_PLATFORM != PLATFORM_WINDOWS - // TODO: Hacks.. #include <limits.h> |