diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-23 04:33:19 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-23 04:33:53 +0300 |
| commit | b69f0479a421baaba1660289d781eaafa1f07673 (patch) | |
| tree | 5da83024548a88da65e26ece97b300e5d89aab27 | |
| parent | 005b7bfbdc21ccc80c16be8c83828fb74b2f4a6e (diff) | |
OpenGL: remove GLU option from build system
Also remove linking in glu libs.
T49042 is now done!
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | intern/ghost/test/CMakeLists.txt | 3 |
2 files changed, 1 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4caedbab6d5..4fe6df2c67b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -474,12 +474,6 @@ mark_as_advanced( WITH_GL_PROFILE_ES20 ) -if(WITH_GL_PROFILE_COMPAT) - set(WITH_GLU ON) -else() - set(WITH_GLU OFF) -endif() - if(WIN32) option(WITH_GL_ANGLE "Link with the ANGLE library, an OpenGL ES 2.0 implementation based on Direct3D, instead of the system OpenGL library." OFF) mark_as_advanced(WITH_GL_ANGLE) @@ -1058,11 +1052,6 @@ endif() find_package(OpenGL) blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}") -if(WITH_GLU) - list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_glu_LIBRARY}") - list(APPEND GL_DEFINITIONS -DWITH_GLU) -endif() - if(WITH_SYSTEM_GLES) find_package_wrapper(OpenGLES) endif() @@ -1290,9 +1279,7 @@ else() endif() -if(NOT WITH_GLU) - list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU) -endif() +list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU) #----------------------------------------------------------------------------- # Configure Bullet @@ -1800,7 +1787,6 @@ if(FIRST_RUN) info_cfg_text("OpenGL:") info_cfg_option(WITH_GLEW_ES) - info_cfg_option(WITH_GLU) info_cfg_option(WITH_GL_EGL) info_cfg_option(WITH_GL_PROFILE_COMPAT) info_cfg_option(WITH_GL_PROFILE_CORE) diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index fb9ef621ecf..ef6e8915871 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -203,7 +203,6 @@ target_link_libraries(gears_c glewmx_lib string_lib ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} ${PLATFORM_LINKLIBS} ) @@ -217,7 +216,6 @@ target_link_libraries(gears_cpp glewmx_lib string_lib ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} ${PLATFORM_LINKLIBS} ) @@ -248,7 +246,6 @@ target_link_libraries(multitest_c guardedalloc_lib wcwidth_lib ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} ${FREETYPE_LIBRARY} ${ZLIB_LIBRARIES} ${PLATFORM_LINKLIBS} |