From 27d16f961b9b543756fe2fa95fe7718dd701f280 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Thu, 28 Sep 2017 13:26:09 +0200 Subject: [PATCH] libobs: Restore Windows Vista compatibility Certain PSAPI functions moved to KERNEL32 after Vista, setting PSAPI_VERSION 1 uses the old PSAPI exports for compatibility. Vista support was unintentionally broken by a6318ff. --- libobs/CMakeLists.txt | 2 +- libobs/util/platform-windows.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index d643dd085..832a22d0c 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -91,7 +91,7 @@ if(WIN32) set(libobs_audio_monitoring_HEADERS audio-monitoring/win32/wasapi-output.h ) - set(libobs_PLATFORM_DEPS winmm) + set(libobs_PLATFORM_DEPS winmm psapi) if(MSVC) set(libobs_PLATFORM_DEPS ${libobs_PLATFORM_DEPS} diff --git a/libobs/util/platform-windows.c b/libobs/util/platform-windows.c index 910a53658..b636506b2 100644 --- a/libobs/util/platform-windows.c +++ b/libobs/util/platform-windows.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define PSAPI_VERSION 1 #include #include #include @@ -48,7 +49,7 @@ static inline uint32_t get_winver(void) winver = (ver.major << 16) | ver.minor; } - return winver; + return winver; } void *os_dlopen(const char *path)