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

Merge branch 'master' into quick-fixes

Browse source
This commit is contained in:
Charlie 2020-01-11 05:31:47 +00:00 committed by GitHub
commit f0b931e02a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop_version/CONTRIBUTORS.txt
View file

@ -5,6 +5,7 @@ Contributors
* Christoph Böhmwalder (@chrboe) * Christoph Böhmwalder (@chrboe)
* Charlie Bruce (@charliebruce) * Charlie Bruce (@charliebruce)
* Brian Callahan (@ibara)
* Daniel Lee (@ddm999) * Daniel Lee (@ddm999)
* Elliott Saltar (@eboyblue3) * Elliott Saltar (@eboyblue3)
* Marvin Scholz (@ePirat) * Marvin Scholz (@ePirat)

8
desktop_version/src/FileSystemUtils.cpp
View file

@ -15,7 +15,7 @@
#include <shlobj.h> #include <shlobj.h>
#define mkdir(a, b) CreateDirectory(a, NULL) #define mkdir(a, b) CreateDirectory(a, NULL)
#define VNEEDS_MIGRATION (mkdirResult != 0) #define VNEEDS_MIGRATION (mkdirResult != 0)
#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <sys/stat.h> #include <sys/stat.h>
#include <limits.h> #include <limits.h>
#define VNEEDS_MIGRATION (mkdirResult == 0) #define VNEEDS_MIGRATION (mkdirResult == 0)
@ -159,7 +159,7 @@ std::vector<std::string> FILESYSTEM_getLevelDirFileNames()
void PLATFORM_getOSDirectory(char* output) void PLATFORM_getOSDirectory(char* output)
{ {
#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__)
strcpy(output, PHYSFS_getPrefDir("distractionware", "VVVVVV")); strcpy(output, PHYSFS_getPrefDir("distractionware", "VVVVVV"));
#elif defined(_WIN32) #elif defined(_WIN32)
SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, output); SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, output);
@ -174,7 +174,7 @@ void PLATFORM_migrateSaveData(char* output)
char oldLocation[MAX_PATH]; char oldLocation[MAX_PATH];
char newLocation[MAX_PATH]; char newLocation[MAX_PATH];
char oldDirectory[MAX_PATH]; char oldDirectory[MAX_PATH];
#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
DIR *dir = NULL; DIR *dir = NULL;
struct dirent *de = NULL; struct dirent *de = NULL;
DIR *subDir = NULL; DIR *subDir = NULL;
@ -187,7 +187,7 @@ void PLATFORM_migrateSaveData(char* output)
return; return;
} }
strcpy(oldDirectory, homeDir); strcpy(oldDirectory, homeDir);
#if defined(__linux__) || defined(__FreeBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
strcat(oldDirectory, "/.vvvvvv/"); strcat(oldDirectory, "/.vvvvvv/");
#elif defined(__APPLE__) #elif defined(__APPLE__)
strcat(oldDirectory, "/Documents/VVVVVV/"); strcat(oldDirectory, "/Documents/VVVVVV/");

4
desktop_version/src/SteamNetwork.c
View file

@ -15,7 +15,7 @@
#define NETWORK_LIBRARY "steam_api.dll" #define NETWORK_LIBRARY "steam_api.dll"
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define NETWORK_LIBRARY "libsteam_api.dylib" #define NETWORK_LIBRARY "libsteam_api.dylib"
#elif defined(__linux__) || defined(__FreeBSD__) #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#define NETWORK_LIBRARY "libsteam_api.so" #define NETWORK_LIBRARY "libsteam_api.so"
#else #else
#error NETWORK_LIBRARY: Unrecognized platform! #error NETWORK_LIBRARY: Unrecognized platform!
@ -97,7 +97,7 @@ static void ClearPointers()
int NETWORK_init() int NETWORK_init()
{ {
#if defined(__FreeBSD__) #if defined(__FreeBSD__) || defined(__OpenBSD__)
return 1; return 1;
#endif #endif
intptr_t steamClient; intptr_t steamClient;