diff options
| author | Max Bachmann <[email protected]> | 2023-07-26 21:57:53 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-26 19:57:53 +0000 |
| commit | 34d07fde84ad64342ae6624334957143319615ab (patch) | |
| tree | 73f003626c538b2682b885560de1a42e9f576311 | |
| parent | 8b3a9b527d87009f86ed0b4eb6c33a9e8dfc069b (diff) | |
disable unavailable functionality on xbox (#887)
* disable unavailable functionality on xbox
* use not std version of getenv on xbox
| -rw-r--r-- | alc/alconfig.cpp | 2 | ||||
| -rw-r--r-- | common/strutils.cpp | 4 | ||||
| -rw-r--r-- | core/helpers.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/alc/alconfig.cpp b/alc/alconfig.cpp index 3c9a9777..03139abe 100644 --- a/alc/alconfig.cpp +++ b/alc/alconfig.cpp @@ -329,6 +329,7 @@ const char *GetConfigValue(const char *devName, const char *blockName, const cha #ifdef _WIN32 void ReadALConfig() { +#if !defined(_GAMING_XBOX) { #if !defined(ALSOFT_UWP) WCHAR buffer[MAX_PATH]; @@ -345,6 +346,7 @@ void ReadALConfig() if(f.is_open()) LoadConfigFromFile(f); } +#endif std::string ppath{GetProcBinary().path}; diff --git a/common/strutils.cpp b/common/strutils.cpp index b221b6ec..355cd030 100644 --- a/common/strutils.cpp +++ b/common/strutils.cpp @@ -45,7 +45,11 @@ namespace al { std::optional<std::string> getenv(const char *envname) { +#ifdef _GAMING_XBOX + const char *str{::getenv(envname)}; +#else const char *str{std::getenv(envname)}; +#endif if(str && str[0] != '\0') return str; return std::nullopt; diff --git a/core/helpers.cpp b/core/helpers.cpp index 0d36048c..b353da2e 100644 --- a/core/helpers.cpp +++ b/core/helpers.cpp @@ -156,7 +156,7 @@ std::vector<std::string> SearchDataFiles(const char *ext, const char *subdir) std::replace(path.begin(), path.end(), '/', '\\'); DirectorySearch(path.c_str(), ext, &results); -#if !defined(ALSOFT_UWP) +#if !defined(ALSOFT_UWP) && !defined(_GAMING_XBOX) /* Search the local and global data dirs. */ for(auto id : std::array{CSIDL_APPDATA, CSIDL_COMMON_APPDATA}) { |