Show
Ignore:
Timestamp:
10/06/10 16:44:52 (3 years ago)
Author:
robert
Message:

Copied libutil and libtess implementations in form Mesa 7.9/src/glu into the src/osg/glu,
changed extensions from .c to .cpp and got compiling as C files as part of the osg core library.

Updated and cleaned up the rest of the OSG to use the new internal GLU.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/CMakeModules/OsgMacroUtils.cmake

    r11354 r11817  
    5252 
    5353MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) 
    54     SET(ALL_GL_LIBRARIES ${OPENGL_LIBRARIES}) 
     54    #SET(ALL_GL_LIBRARIES ${OPENGL_LIBRARIES}) 
     55    SET(ALL_GL_LIBRARIES ${OPENGL_gl_LIBRARY}) 
    5556    IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE) 
    5657        SET(ALL_GL_LIBRARIES ${ALL_GL_LIBRARIES} ${OPENGL_egl_LIBRARY}) 
    … …  
    101102    ENDFOREACH(LINKLIB) 
    102103 
    103     SET(ALL_GL_LIBRARIES ${OPENGL_LIBRARIES}) 
     104    #SET(ALL_GL_LIBRARIES ${OPENGL_LIBRARIES}) 
     105    SET(ALL_GL_LIBRARIES ${OPENGL_gl_LIBRARY}) 
    104106    IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE) 
    105107        SET(ALL_GL_LIBRARIES ${ALL_GL_LIBRARIES} ${OPENGL_egl_LIBRARY})