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

Merge pull request #1362 from chrisballinger/10.10-opengl-build-fix 

Fix OpenGL linker error on Yosemite
This commit is contained in:
Ryan Houdek 2014-10-22 03:20:03 -05:00
parent 5d4b4c793a ffe976659e
commit ce3a039eed
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -282,6 +282,7 @@ if(APPLE)
find_library(QUICKTIME_LIBRARY QuickTime) find_library(QUICKTIME_LIBRARY QuickTime)
find_library(WEBKIT_LIBRARY WebKit) find_library(WEBKIT_LIBRARY WebKit)
find_library(FORCEFEEDBACK ForceFeedback) find_library(FORCEFEEDBACK ForceFeedback)
find_library(OPENGL_LIBRARY OpenGL)
endif() endif()
if(WIN32) if(WIN32)

1
Externals/wxWidgets3/CMakeLists.txt vendored
View File

@ -879,6 +879,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
${COREFUND_LIBRARY} ${COREFUND_LIBRARY}
${CORESERV_LIBRARY} ${CORESERV_LIBRARY}
${IOK_LIBRARY} ${IOK_LIBRARY}
${OPENGL_LIBRARY}
${QUICKTIME_LIBRARY}) ${QUICKTIME_LIBRARY})
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-D__WXGTK__) add_definitions(-D__WXGTK__)