From 4932f36da4fab3fc8965822bba473cbd20f7f405 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Fri, 12 Nov 2021 13:34:50 -0800 Subject: Fix compile errors under MSVC, remove PLATFORM_* macros in favor of compiler builtin macros, and add win32 support to FileStream --- core/src/Utils/StandardDirectories.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'core/src/Utils/StandardDirectories.cpp') diff --git a/core/src/Utils/StandardDirectories.cpp b/core/src/Utils/StandardDirectories.cpp index e7d3657..2202f51 100644 --- a/core/src/Utils/StandardDirectories.cpp +++ b/core/src/Utils/StandardDirectories.cpp @@ -5,7 +5,7 @@ namespace fs = std::filesystem; -#if PLATFORM_WIN32 +#if defined(_WIN32) // https://stackoverflow.com/questions/54499256/how-to-find-the-saved-games-folder-programmatically-in-c-c # include # include @@ -29,9 +29,9 @@ static fs::path GetAppDataRoaming() } } -#elif PLATFORM_MACOS +#elif defined(__APPLE__) // TODO -#elif PLATFORM_LINUX +#elif defined(__linux__) # include static fs::path GetEnvVar(const char* name, const char* backup) @@ -52,11 +52,11 @@ static fs::path GetEnvVar(const char* name, const char* backup) const std::filesystem::path& StandardDirectories::UserData() { static auto userDataDir = []() -> fs::path { -#if PLATFORM_WIN32 +#if defined(_WIN32) return GetAppDataRoaming(); -#elif PLATFORM_MACOS +#elif defined(__APPLE__) // TODO where? -#elif PLATFORM_LINUX +#elif defined(__linux__) return GetEnvVar("XDG_DATA_HOME", "~/.local/share"); #endif }(); @@ -66,11 +66,11 @@ const std::filesystem::path& StandardDirectories::UserData() const std::filesystem::path& StandardDirectories::UserConfig() { static auto userConfigDir = []() -> fs::path { -#if PLATFORM_WIN32 +#if defined(_WIN32) return GetAppDataRoaming(); -#elif PLATFORM_MACOS +#elif defined(__APPLE__) // TODO where? -#elif PLATFORM_LINUX +#elif defined(__linux__) return GetEnvVar("XDG_CONFIG_HOME", "~/.config"); #endif }(); -- cgit v1.2.3-70-g09d2