From 732850843672eaceb48b5cb9b18d76e730e5b2b1 Mon Sep 17 00:00:00 2001 From: Pierre-Alain TORET Date: Mon, 20 Apr 2020 15:41:11 +0200 Subject: [PATCH] Fix build on DragonFlyBSD --- desktop_version/CONTRIBUTORS.txt | 1 + desktop_version/src/FileSystemUtils.cpp | 8 ++++---- desktop_version/src/SteamNetwork.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/desktop_version/CONTRIBUTORS.txt b/desktop_version/CONTRIBUTORS.txt index c1f4f166..7b149787 100644 --- a/desktop_version/CONTRIBUTORS.txt +++ b/desktop_version/CONTRIBUTORS.txt @@ -20,6 +20,7 @@ Contributors * Thomas Sänger (@HorayNarea) * Info Teddy (@InfoTeddy) * Alexandra Tildea (@AllyTally) +* Pierre-Alain TORET (@daftaupe) * leo60228 (@leo60228) * Emmanuel Vadot (@evadot) * Rémi Verschelde (@akien-mga) diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp index 30ad4cc6..ce4660af 100644 --- a/desktop_version/src/FileSystemUtils.cpp +++ b/desktop_version/src/FileSystemUtils.cpp @@ -27,7 +27,7 @@ int mkdir(char* path, int mode) return CreateDirectoryW(utf16_path, NULL); } #define VNEEDS_MIGRATION (mkdirResult != 0) -#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) #include #include #define VNEEDS_MIGRATION (mkdirResult == 0) @@ -277,7 +277,7 @@ void PLATFORM_migrateSaveData(char* output) char oldLocation[MAX_PATH]; char newLocation[MAX_PATH]; char oldDirectory[MAX_PATH]; -#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) +#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) DIR *dir = NULL; struct dirent *de = NULL; DIR *subDir = NULL; @@ -290,7 +290,7 @@ void PLATFORM_migrateSaveData(char* output) return; } strcpy(oldDirectory, homeDir); -#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) strcat(oldDirectory, "/.vvvvvv/"); #elif defined(__APPLE__) strcat(oldDirectory, "/Documents/VVVVVV/"); @@ -485,7 +485,7 @@ bool FILESYSTEM_openDirectory(const char *dname) ShellExecute(NULL, "open", dname, NULL, NULL, SW_SHOWMINIMIZED); return true; } -#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) +#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) #ifdef __linux__ const char* open_cmd = "xdg-open"; #else diff --git a/desktop_version/src/SteamNetwork.c b/desktop_version/src/SteamNetwork.c index 45231715..892d85ab 100644 --- a/desktop_version/src/SteamNetwork.c +++ b/desktop_version/src/SteamNetwork.c @@ -13,7 +13,7 @@ #define STEAM_LIBRARY "steam_api.dll" #elif defined(__APPLE__) #define STEAM_LIBRARY "libsteam_api.dylib" -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) #define STEAM_LIBRARY "libsteam_api.so" #else #error STEAM_LIBRARY: Unrecognized platform! @@ -95,7 +95,7 @@ static void ClearPointers() int32_t STEAM_init() { -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) return 0; #endif intptr_t steamClient;