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

Remove hard dependency of GLX from Dolphin with X11. 

This is particularly annoying on a EGL only system that doesn't have GLX.
This commit is contained in:
Ryan Houdek 2014-10-19 07:35:22 -05:00
parent 44f2df0130
commit 821a41e62f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -86,8 +86,13 @@ if(WIN32)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(SRCS ${SRCS} GLInterface/AGL.cpp) set(SRCS ${SRCS} GLInterface/AGL.cpp)
elseif(USE_X11) elseif(USE_X11)
set(SRCS ${SRCS} GLInterface/GLX.cpp if (NOT USE_EGL)
GLInterface/X11_Util.cpp) 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() endif()
set(SRCS ${SRCS} GLInterface/GLInterface.cpp) set(SRCS ${SRCS} GLInterface/GLInterface.cpp)