From 821a41e62fe03c5db5f1f7326e79f22f00259b7c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 19 Oct 2014 07:35:22 -0500 Subject: [PATCH] Remove hard dependency of GLX from Dolphin with X11. This is particularly annoying on a EGL only system that doesn't have GLX. --- Source/Core/DolphinWX/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 8a007d0593..ea437c18eb 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -86,8 +86,13 @@ if(WIN32) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(SRCS ${SRCS} GLInterface/AGL.cpp) elseif(USE_X11) - set(SRCS ${SRCS} GLInterface/GLX.cpp - GLInterface/X11_Util.cpp) + if (NOT USE_EGL) + set(SRCS ${SRCS} GLInterface/GLX.cpp) + # GLX has a hard dependency on libGL. + # Make sure to link to it if using GLX. + set(LIBS ${LIBS} ${OPENGL_LIBRARIES}) + endif() + set(SRCS ${SRCS} GLInterface/X11_Util.cpp) endif() set(SRCS ${SRCS} GLInterface/GLInterface.cpp)