OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0025162: Visualization, TKOpenGl - drop GLU library dependency

Browse Source 
Drop gluScaleImage() and gluBuild2DMipmaps().
Drop gluUnPorject() from samples.
Output message if NPOT is unsupported and texture coordinates was scaled. Texture initialization is fail in this case.
Output message if texture dimension exceed the max dimension. Texture initialization is fail in this case.
TKOpenGl does not depends on deprecated GLU anymore.
This commit is contained in:
isk
2015-09-08 15:15:04 +03:00
committed by bugmaster
parent 8891791e86
commit fa4dcbe04f
8 changed files with 118 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/TKService/CMakeLists.txt
View File

@@ -18,12 +18,10 @@ endif()
if (WIN32)
list( APPEND USED_LIBS opengl32.lib )
list( APPEND USED_LIBS glu32.lib )
elseif(APPLE)
find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
if(USE_GLX)
list( APPEND USED_LIBS GL )
list( APPEND USED_LIBS GLU )
find_package(X11 COMPONENTS X11 Xext Xmu Xi)
list( APPEND USED_LIBS ${X11_LIBRARIES} )
list( APPEND USED_LIBS ${X11_Xi_LIB} )
@@ -40,7 +38,6 @@ elseif(APPLE)
find_library(FRAMEWORKS_IOKIT NAMES IOKit)
list( APPEND USED_LIBS ${FRAMEWORKS_IOKIT} )
else()
list( APPEND USED_LIBS GLU )
list( APPEND USED_LIBS GL )
list( APPEND USED_LIBS X11 )
list( APPEND USED_LIBS Xext )