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

Fix OpenGL linker error on Yosemite
2014-10-22 03:20:03 -05:00 · 2014-10-22 03:20:03 -05:00 · ce3a039eed
parent 5d4b4c793a ffe976659e
commit ce3a039eed
2 changed files with 2 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -282,6 +282,7 @@ if(APPLE)
 	find_library(QUICKTIME_LIBRARY QuickTime)
 	find_library(WEBKIT_LIBRARY WebKit)
 	find_library(FORCEFEEDBACK ForceFeedback)
+	find_library(OPENGL_LIBRARY OpenGL)
 endif()

 if(WIN32)
--- a/Externals/wxWidgets3/CMakeLists.txt
+++ b/Externals/wxWidgets3/CMakeLists.txt
@ -879,6 +879,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		${COREFUND_LIBRARY}
 		${CORESERV_LIBRARY}
 		${IOK_LIBRARY}
+		${OPENGL_LIBRARY}
 		${QUICKTIME_LIBRARY})
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_definitions(-D__WXGTK__)