From 50446f7feff4990052c78c53b30978acd92018bd Mon Sep 17 00:00:00 2001 From: scribam Date: Sat, 24 Mar 2018 10:04:47 +0100 Subject: [PATCH] Partial compilation fixes for osx --- rpcs3/CMakeLists.txt | 6 ++++++ rpcs3/Emu/RSX/GL/OpenGL.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 0b480859b4..5fc622ad84 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -396,6 +396,12 @@ if(NOT MSVC) target_link_libraries(rpcs3 GLEW::GLEW) endif() +if(UNIX) + find_package(X11 REQUIRED) + target_include_directories(rpcs3 PUBLIC ${X11_INCLUDE_DIR}) + target_link_libraries(rpcs3 ${X11_LIBRARIES}) +endif() + if(WIN32) target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib gdi32.lib VKstatic.1 glslang OSDependent OGLCompiler SPIRV HLSL setupapi.lib hidapi-hid Shlwapi.lib) if(NOT MSVC) diff --git a/rpcs3/Emu/RSX/GL/OpenGL.cpp b/rpcs3/Emu/RSX/GL/OpenGL.cpp index 65828dbb39..c6e54ae070 100644 --- a/rpcs3/Emu/RSX/GL/OpenGL.cpp +++ b/rpcs3/Emu/RSX/GL/OpenGL.cpp @@ -57,6 +57,6 @@ void gl::set_swapinterval(int interval) //No existing drawable or missing swap extension, EGL? LOG_ERROR(RSX, "Failed to set swap interval"); #else - LOG_UNIMPLEMENTED(RSX, "Swap control not implemented for this platform. Vsync options not available."); + LOG_ERROR(RSX, "Swap control not implemented for this platform. Vsync options not available."); #endif }