ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partial compilation fixes for osx

This commit is contained in:
scribam 2018-03-24 10:04:47 +01:00 committed by Ani
parent c5caaa9211
commit 50446f7fef
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/CMakeLists.txt
View File

@ -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)

2
rpcs3/Emu/RSX/GL/OpenGL.cpp
View File

@ -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
}