Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenGL: remove GLU option from build system

Browse Source 
Also remove linking in glu libs.

T49042 is now done!
This commit is contained in:
Mike Erwin
2017-03-22 21:33:19 -04:00
parent 005b7bfbdc
commit b69f0479a4
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -474,12 +474,6 @@ mark_as_advanced(
WITH_GL_PROFILE_ES20 WITH_GL_PROFILE_ES20
) )
if(WITH_GL_PROFILE_COMPAT)
set(WITH_GLU ON)
else()
set(WITH_GLU OFF)
endif()
if(WIN32) 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) 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) mark_as_advanced(WITH_GL_ANGLE)
@@ -1058,11 +1052,6 @@ endif()
find_package(OpenGL) find_package(OpenGL)
blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}") 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) if(WITH_SYSTEM_GLES)
find_package_wrapper(OpenGLES) find_package_wrapper(OpenGLES)
endif() endif()
@@ -1290,9 +1279,7 @@ else()
endif() endif()
if(NOT WITH_GLU) list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Configure Bullet # Configure Bullet
@@ -1800,7 +1787,6 @@ if(FIRST_RUN)
info_cfg_text("OpenGL:") info_cfg_text("OpenGL:")
info_cfg_option(WITH_GLEW_ES) info_cfg_option(WITH_GLEW_ES)
info_cfg_option(WITH_GLU)
info_cfg_option(WITH_GL_EGL) info_cfg_option(WITH_GL_EGL)
info_cfg_option(WITH_GL_PROFILE_COMPAT) info_cfg_option(WITH_GL_PROFILE_COMPAT)
info_cfg_option(WITH_GL_PROFILE_CORE) info_cfg_option(WITH_GL_PROFILE_CORE)

3
intern/ghost/test/CMakeLists.txt
View File

@@ -203,7 +203,6 @@ target_link_libraries(gears_c
glewmx_lib glewmx_lib
string_lib string_lib
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${PLATFORM_LINKLIBS} ${PLATFORM_LINKLIBS}
) )
@@ -217,7 +216,6 @@ target_link_libraries(gears_cpp
glewmx_lib glewmx_lib
string_lib string_lib
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${PLATFORM_LINKLIBS} ${PLATFORM_LINKLIBS}
) )
@@ -248,7 +246,6 @@ target_link_libraries(multitest_c
guardedalloc_lib guardedalloc_lib
wcwidth_lib wcwidth_lib
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${FREETYPE_LIBRARY} ${FREETYPE_LIBRARY}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${PLATFORM_LINKLIBS} ${PLATFORM_LINKLIBS}