Fix build problems on Linux
This commit is contained in:
@@ -14,8 +14,10 @@
|
|||||||
// lib includes
|
// lib includes
|
||||||
#include <boost/core/noncopyable.hpp>
|
#include <boost/core/noncopyable.hpp>
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio/ip/address.hpp>
|
||||||
#include <boost/process.hpp>
|
#include <boost/process/v1/child.hpp>
|
||||||
|
#include <boost/process/v1/group.hpp>
|
||||||
|
#include <boost/process/v1/environment.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// local includes
|
// local includes
|
||||||
|
|||||||
@@ -22,7 +22,14 @@
|
|||||||
// lib includes
|
// lib includes
|
||||||
#include <boost/asio/ip/address.hpp>
|
#include <boost/asio/ip/address.hpp>
|
||||||
#include <boost/asio/ip/host_name.hpp>
|
#include <boost/asio/ip/host_name.hpp>
|
||||||
#include <boost/process/v1.hpp>
|
#include <boost/process/v1/group.hpp>
|
||||||
|
#include <boost/process/v1/child.hpp>
|
||||||
|
#include <boost/process/v1/env.hpp>
|
||||||
|
#include <boost/process/v1/environment.hpp>
|
||||||
|
#include <boost/process/v1/group.hpp>
|
||||||
|
#include <boost/process/v1/handles.hpp>
|
||||||
|
#include <boost/process/v1/io.hpp>
|
||||||
|
#include <boost/process/v1/start_dir.hpp>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
@@ -45,7 +52,7 @@
|
|||||||
|
|
||||||
using namespace std::literals;
|
using namespace std::literals;
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
namespace bp = boost::process;
|
namespace bp = boost::process::v1;
|
||||||
|
|
||||||
window_system_e window_system;
|
window_system_e window_system;
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,9 @@
|
|||||||
*/
|
*/
|
||||||
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
|
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
|
||||||
|
|
||||||
|
#ifndef BOOST_PROCESS_VERSION
|
||||||
|
#define BOOST_PROCESS_VERSION 1
|
||||||
|
#endif
|
||||||
// standard includes
|
// standard includes
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ namespace proc {
|
|||||||
std::string get_app_image(int app_id);
|
std::string get_app_image(int app_id);
|
||||||
std::string get_last_run_app_name();
|
std::string get_last_run_app_name();
|
||||||
std::string get_running_app_uuid();
|
std::string get_running_app_uuid();
|
||||||
boost::process::environment get_env();
|
boost::process::v1::environment get_env();
|
||||||
void terminate(bool immediate = false, bool needs_refresh = true);
|
void terminate(bool immediate = false, bool needs_refresh = true);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -162,7 +162,7 @@ namespace proc {
|
|||||||
};
|
};
|
||||||
|
|
||||||
boost::filesystem::path
|
boost::filesystem::path
|
||||||
find_working_directory(const std::string &cmd, boost::process::environment &env);
|
find_working_directory(const std::string &cmd, boost::process::v1::environment &env);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Calculate a stable id based on name and image data
|
* @brief Calculate a stable id based on name and image data
|
||||||
@@ -199,4 +199,4 @@ namespace proc {
|
|||||||
|
|
||||||
#ifdef BOOST_PROCESS_VERSION
|
#ifdef BOOST_PROCESS_VERSION
|
||||||
#undef BOOST_PROCESS_VERSION
|
#undef BOOST_PROCESS_VERSION
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -56,12 +56,13 @@ namespace video {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
if (devices.empty()) {
|
if (devices.empty()) {
|
||||||
|
#ifdef _WIN32
|
||||||
// We'll create a temporary virtual display for probing anyways.
|
// We'll create a temporary virtual display for probing anyways.
|
||||||
if (proc::vDisplayDriverStatus == VDISPLAY::DRIVER_STATUS::OK) {
|
if (proc::vDisplayDriverStatus == VDISPLAY::DRIVER_STATUS::OK) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Since Windows 11 24H2, it is possible that there will be no active devices present
|
// Since Windows 11 24H2, it is possible that there will be no active devices present
|
||||||
|
|||||||
Reference in New Issue
Block a user