Commit a96980ab authored by Thery Sylvain's avatar Thery Sylvain

resolve pb de cyclic dependencies in libraries

parent 0b676145
...@@ -303,9 +303,18 @@ ELSE() ...@@ -303,9 +303,18 @@ ELSE()
ELSE() ELSE()
add_library( utils ${files_utils} ) add_library( utils ${files_utils} )
ENDIF() ENDIF()
target_link_libraries(utils ${CGoGN_EXT_LIBS})
add_library( container ${files_container}) add_library( container ${files_container})
target_link_libraries(container utils)
add_library( topology ${files_topology}) add_library( topology ${files_topology})
target_link_libraries(topology container)
add_library( algo ${files_algo}) add_library( algo ${files_algo})
target_link_libraries(algo utils topology)
add_custom_target( Geometry SOURCES ${files_geometry} ) add_custom_target( Geometry SOURCES ${files_geometry} )
add_custom_target( ThirdParty SOURCES ${files_thirdParty} ) add_custom_target( ThirdParty SOURCES ${files_thirdParty} )
add_dependencies( utils shader_target ) add_dependencies( utils shader_target )
......
...@@ -191,6 +191,7 @@ void VBO_Node::render() ...@@ -191,6 +191,7 @@ void VBO_Node::render()
{ {
if (m_vbo != NULL) if (m_vbo != NULL)
{ {
/*
if (m_primitives & Algo::Render::GL2::TRIANGLES) if (m_primitives & Algo::Render::GL2::TRIANGLES)
{ {
glEnable(GL_POLYGON_OFFSET_FILL); glEnable(GL_POLYGON_OFFSET_FILL);
...@@ -223,6 +224,7 @@ void VBO_Node::render() ...@@ -223,6 +224,7 @@ void VBO_Node::render()
m_vbo->draw(m_current_material->getShader(), Algo::Render::GL2::POINTS); m_vbo->draw(m_current_material->getShader(), Algo::Render::GL2::POINTS);
glUseProgram(prg); glUseProgram(prg);
} }
*/
// if (m_primitives & Algo::Render::GL2::FLAT_TRIANGLES) // if (m_primitives & Algo::Render::GL2::FLAT_TRIANGLES)
// { // {
// glEnable(GL_POLYGON_OFFSET_FILL); // glEnable(GL_POLYGON_OFFSET_FILL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment