mirror of https://github.com/RPCS3/rpcs3.git
Partial compilation fixes for osx
This commit is contained in:
parent
c5caaa9211
commit
50446f7fef
|
@ -396,6 +396,12 @@ if(NOT MSVC)
|
||||||
target_link_libraries(rpcs3 GLEW::GLEW)
|
target_link_libraries(rpcs3 GLEW::GLEW)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(UNIX)
|
||||||
|
find_package(X11 REQUIRED)
|
||||||
|
target_include_directories(rpcs3 PUBLIC ${X11_INCLUDE_DIR})
|
||||||
|
target_link_libraries(rpcs3 ${X11_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
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)
|
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)
|
if(NOT MSVC)
|
||||||
|
|
|
@ -57,6 +57,6 @@ void gl::set_swapinterval(int interval)
|
||||||
//No existing drawable or missing swap extension, EGL?
|
//No existing drawable or missing swap extension, EGL?
|
||||||
LOG_ERROR(RSX, "Failed to set swap interval");
|
LOG_ERROR(RSX, "Failed to set swap interval");
|
||||||
#else
|
#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
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue