mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Pull openDirectoryEnabled out of the openDirectory ifdefness

Browse source
This commit is contained in:
Ethan Lee 2020-04-18 11:37:28 -04:00
parent ca0e9ec963
commit 6f26443783
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
desktop_version/src/FileSystemUtils.cpp
View file

@ -470,22 +470,22 @@ void PLATFORM_copyFile(const char *oldLocation, const char *newLocation)
printf("Copied:\n\tOld: %s\n\tNew: %s\n", oldLocation, newLocation); printf("Copied:\n\tOld: %s\n\tNew: %s\n", oldLocation, newLocation);
} }
#ifdef _WIN32
bool FILESYSTEM_openDirectoryEnabled() bool FILESYSTEM_openDirectoryEnabled()
{ {
return true; /* This is just a check to see if we're on a desktop or tenfoot setup.
* If you're working on a tenfoot-only build, add a def that always
* returns false!
*/
return !SDL_GetHintBoolean("SteamTenfoot", SDL_TRUE);
} }
#ifdef _WIN32
bool FILESYSTEM_openDirectory(const char *dname) bool FILESYSTEM_openDirectory(const char *dname)
{ {
ShellExecute(NULL, "open", dname, NULL, NULL, SW_SHOWMINIMIZED); ShellExecute(NULL, "open", dname, NULL, NULL, SW_SHOWMINIMIZED);
return true; return true;
} }
#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__)
bool FILESYSTEM_openDirectoryEnabled()
{
return std::getenv("SteamTenfoot") == NULL;
}
#ifdef __linux__ #ifdef __linux__
const char* open_cmd = "xdg-open"; const char* open_cmd = "xdg-open";
#else #else
@ -505,11 +505,6 @@ bool FILESYSTEM_openDirectory(const char *dname)
return WIFEXITED(status) && WEXITSTATUS(status) == 0; return WIFEXITED(status) && WEXITSTATUS(status) == 0;
} }
#else #else
bool FILESYSTEM_openDirectoryEnabled()
{
return false;
}
bool FILESYSTEM_openDirectory(const char *dname) bool FILESYSTEM_openDirectory(const char *dname)
{ {
return false; return false;