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

cmake: Fix GSdx EGL build libX11-xcb linkage issue 

Prevents a XGetXCBConnection undefined symbol error.
This commit is contained in:
Jonathan Li 2018-05-25 00:12:07 +01:00
parent 6ef793545d
commit 61406a4349
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/SearchForStuff.cmake
View File

@ -94,6 +94,7 @@ if(Linux)
endif() endif()
if(EGL_API) if(EGL_API)
check_lib(EGL EGL EGL/egl.h) check_lib(EGL EGL EGL/egl.h)
check_lib(X11_XCB X11-xcb X11/Xlib-xcb.h)
endif() endif()
if(OPENCL_API) if(OPENCL_API)
check_lib(OPENCL OpenCL CL/cl.hpp) check_lib(OPENCL OpenCL CL/cl.hpp)

2
cmake/SelectPcsx2Plugins.cmake
View File

@ -141,7 +141,7 @@ endif()
# -X11 # -X11
# -zlib # -zlib
#--------------------------------------- #---------------------------------------
if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND ZLIB_FOUND AND PNG_FOUND AND FREETYPE_FOUND AND LIBLZMA_FOUND AND (EGL_FOUND OR NOT EGL_API)) if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND ZLIB_FOUND AND PNG_FOUND AND FREETYPE_FOUND AND LIBLZMA_FOUND AND ((EGL_FOUND AND X11_XCB_FOUND) OR NOT EGL_API))
set(GSdx TRUE) set(GSdx TRUE)
elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx") elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx")
set(GSdx FALSE) set(GSdx FALSE)

2
plugins/GSdx/CMakeLists.txt
View File

@ -272,7 +272,7 @@ set(GSdxFinalLibs
) )
if(EGL_API AND EGL_FOUND) if(EGL_API AND EGL_FOUND)
set(GSdxFinalLibs ${GSdxFinalLibs} ${EGL_LIBRARIES}) set(GSdxFinalLibs ${GSdxFinalLibs} ${EGL_LIBRARIES} ${X11_XCB_LIBRARIES})
endif() endif()
if(USE_VTUNE) if(USE_VTUNE)