LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

System.cpp: Do not require posix_spawn on "Linux"

Browse Source 
Many libc implementations do not implement posix_spawn.
Allow love2d to build without it.
This commit is contained in:
Gleb Mazovetskiy
2020-10-11 10:45:37 +01:00
parent d2c42bd746
commit 0ad34a3c71
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/system/System.cpp
+22
View File
@@ -39,7 +39,18 @@
#if defined(LOVE_ANDROID) #if defined(LOVE_ANDROID)
#include "common/android.h" #include "common/android.h"
#elif defined(LOVE_LINUX) #elif defined(LOVE_LINUX)
#ifdef __has_include
#if __has_include(<spawn.h>)
#define LOVE_HAS_POSIX_SPAWN
#endif
#endif
#ifdef LOVE_HAS_POSIX_SPAWN
#include <spawn.h> #include <spawn.h>
#else
#include <unistd.h>
#endif
#endif #endif
namespace love namespace love
@@ -70,10 +81,12 @@ std::string System::getOS() const
#endif #endif
} }
#ifdef LOVE_HAS_POSIX_SPAWN
extern "C" extern "C"
{ {
extern char **environ; // The environment, always available extern char **environ; // The environment, always available
} }
#endif
bool System::openURL(const std::string &url) const bool System::openURL(const std::string &url) const
{ {
@@ -104,10 +117,19 @@ bool System::openURL(const std::string &url) const
pid_t pid; pid_t pid;
const char *argv[] = {"xdg-open", url.c_str(), nullptr}; const char *argv[] = {"xdg-open", url.c_str(), nullptr};
#ifdef LOVE_HAS_POSIX_SPAWN
// Note: at the moment this process inherits our file descriptors. // Note: at the moment this process inherits our file descriptors.
// Note: the below const_cast is really ugly as well. // Note: the below const_cast is really ugly as well.
if (posix_spawnp(&pid, "xdg-open", nullptr, nullptr, const_cast<char **>(argv), environ) != 0) if (posix_spawnp(&pid, "xdg-open", nullptr, nullptr, const_cast<char **>(argv), environ) != 0)
return false; return false;
#else
pid = fork();
if (pid == 0)
{
execvp("xdg-open", const_cast<char **>(argv));
return false;
}
#endif
// Check if xdg-open already completed (or failed.) // Check if xdg-open already completed (or failed.)
int status = 0; int status = 0;