Commit: 255ab75eb3af6e1e56e68c5abf09970a59d980e5 Author: Sergey Sharybin Date: Thu Jan 3 17:42:04 2019 +0100 Branches: master https://developer.blender.org/rB255ab75eb3af6e1e56e68c5abf09970a59d980e5
Don't link against GLU library We are core profile now, no need to link against GLU. This change makes it so Blender binary is not dependent on liGLU.so. That was a weird thing that Blender was dependent on it, but was not using any functions from it. =================================================================== M CMakeLists.txt =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 3218bf9ba4b..8d8f78a3e7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1057,8 +1057,11 @@ if(WITH_GL_PROFILE_ES20) endif() else() - list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}") - + if(OpenGL_GL_PREFERENCE STREQUAL "LEGACY" AND OPENGL_gl_LIBRARY) + list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glx_LIBRARY}) + else() + list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY}) + endif() endif() if(WITH_GL_EGL) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs