diff --git a/cmake/dependencies/Boost_Sunshine.cmake b/cmake/dependencies/Boost_Sunshine.cmake index eb2ac409..5497bd30 100644 --- a/cmake/dependencies/Boost_Sunshine.cmake +++ b/cmake/dependencies/Boost_Sunshine.cmake @@ -3,7 +3,7 @@ # include_guard(GLOBAL) -set(BOOST_VERSION "1.87.0") +set(BOOST_VERSION "1.88.0") set(BOOST_COMPONENTS filesystem locale diff --git a/src/platform/windows/display_base.cpp b/src/platform/windows/display_base.cpp index 66985662..7434e4e6 100644 --- a/src/platform/windows/display_base.cpp +++ b/src/platform/windows/display_base.cpp @@ -11,7 +11,6 @@ // lib includes #include -#include #include // We have to include boost/process/v1.hpp before display.h due to WinSock.h, @@ -41,7 +40,6 @@ namespace platf { } namespace platf::dxgi { - namespace bp = boost::process; /** * DDAPI-specific initialization goes here. diff --git a/src/platform/windows/misc.cpp b/src/platform/windows/misc.cpp index 1bca479b..b21287d3 100644 --- a/src/platform/windows/misc.cpp +++ b/src/platform/windows/misc.cpp @@ -10,10 +10,16 @@ #include #include +#ifndef BOOST_PROCESS_VERSION + #define BOOST_PROCESS_VERSION 1 +#endif + // lib includes #include #include -#include +#include +#include +#include #include // prevent clang format from "optimizing" the header include order @@ -1949,3 +1955,7 @@ static int setClipboardData(const std::wstring& utf16Str) { return 0; } + +#ifdef BOOST_PROCESS_VERSION + #undef BOOST_PROCESS_VERSION +#endif \ No newline at end of file diff --git a/src/platform/windows/virtual_display.cpp b/src/platform/windows/virtual_display.cpp index 96d1168a..4594ad16 100644 --- a/src/platform/windows/virtual_display.cpp +++ b/src/platform/windows/virtual_display.cpp @@ -1170,9 +1170,9 @@ std::vector< struct positionwidthheight*>rearrangeVirtualDisplayForLowerRight(st // Utility function to match the DeviceString to the Display Names // Typical DeviceStrings are the driver names -// +// // Example: matchDisplay(L"SudoMaker Virtual Display Adapter") -// Result: L"\\\\.\\Display2" +// Result: L"\\\\.\\Display2" std::vector matchDisplay(std::wstring sMatch) { DISPLAY_DEVICEW displayDevice; diff --git a/src/process.h b/src/process.h index 8d430a96..e406dd93 100644 --- a/src/process.h +++ b/src/process.h @@ -8,12 +8,19 @@ #define __kernel_entry #endif +#ifndef BOOST_PROCESS_VERSION + #define BOOST_PROCESS_VERSION 1 +#endif + // standard includes #include #include // lib includes -#include +#include +#include +#include +#include #include #include @@ -189,3 +196,7 @@ namespace proc { extern int terminate_app_id; extern std::string terminate_app_id_str; } // namespace proc + +#ifdef BOOST_PROCESS_VERSION + #undef BOOST_PROCESS_VERSION +#endif \ No newline at end of file diff --git a/src/system_tray.cpp b/src/system_tray.cpp index 138b8a78..19aa7374 100644 --- a/src/system_tray.cpp +++ b/src/system_tray.cpp @@ -29,6 +29,10 @@ #define TRAY_MSG_NO_APP_RUNNING "Reload Apps" + #ifndef BOOST_PROCESS_VERSION + #define BOOST_PROCESS_VERSION 1 + #endif + // standard includes #include #include @@ -417,4 +421,9 @@ namespace system_tray { } } // namespace system_tray + + #ifdef BOOST_PROCESS_VERSION + #undef BOOST_PROCESS_VERSION 1 + #endif + #endif diff --git a/third-party/googletest b/third-party/googletest index 445e9bd8..04ee1b4f 160000 --- a/third-party/googletest +++ b/third-party/googletest @@ -1 +1 @@ -Subproject commit 445e9bd8d00180d7574069a7ab19abfae18bc9a2 +Subproject commit 04ee1b4f2aefdffb0135d7cf2a2c519fe50dabe4