disable unavailable functionality on xbox (#887)

* disable unavailable functionality on xbox * use not std version of getenv on xbox
kcat · Jul 26, 2023 · 34d07fd · 34d07fd
1 parent 8b3a9b5
commit 34d07fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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})
     {