From 821a41e62fe03c5db5f1f7326e79f22f00259b7c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 19 Oct 2014 07:35:22 -0500 Subject: [PATCH 1/2] 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) From e236d285858415e7c63a6b5a35f7c24306a6a930 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 19 Oct 2014 07:36:33 -0500 Subject: [PATCH 2/2] Remove a hard dependency from libGL from the software renderer. I must have missed this when dropping OpenGL library includes. This is annoying when on a system that doesn't have libGL. --- Source/Core/VideoBackends/Software/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt index 42381c02d2..b12ade865c 100644 --- a/Source/Core/VideoBackends/Software/CMakeLists.txt +++ b/Source/Core/VideoBackends/Software/CMakeLists.txt @@ -25,7 +25,6 @@ set(LIBS videocommon SOIL common ${X11_LIBRARIES} - ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES}) add_dolphin_library(videosoftware "${SRCS}" "${LIBS}")