Skip to content

Commit

Permalink
Remove all the GLUT-related functions and close #2
Browse files Browse the repository at this point in the history
  • Loading branch information
yuki-koyama committed Aug 25, 2018
1 parent d4cec63 commit 9246e27
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 81 deletions.
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ if(APPLE AND EXISTS /usr/local/opt/qt5)
endif()

find_package(OpenGL REQUIRED)
find_package(GLUT REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(Qt5 COMPONENTS Widgets Gui REQUIRED)
find_package(glm REQUIRED)

include_directories(${OPENGL_INCLUDE_DIRS})
include_directories(${GLUT_INCLUDE_DIRS})
include_directories(${EIGEN3_INCLUDE_DIR})
include_directories(${Qt5Gui_INCLUDE_DIRS})
include_directories(${Qt5Widgets_INCLUDE_DIRS})
Expand All @@ -31,7 +29,7 @@ file(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/three-dim-util/*.hpp)
file(GLOB sources ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)

add_library(three-dim-util STATIC ${headers} ${sources})
target_link_libraries(three-dim-util ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} Qt5::Gui Qt5::Widgets glm)
target_link_libraries(three-dim-util ${OPENGL_LIBRARIES} Qt5::Gui Qt5::Widgets glm)
target_include_directories(three-dim-util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)

install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/three-dim-util)
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ A library of utility functions for prototyping OpenGL applications.
## Dependencies

- OpenGL
- GLUT
- Eigen <http://eigen.tuxfamily.org/>
- Qt <https://www.qt.io/>
- glm <https://glm.g-truc.net/>
Expand Down
4 changes: 0 additions & 4 deletions include/three-dim-util/gl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@

#ifdef __APPLE__
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <GLUT/glut.h>
#else
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glut.h>
#endif

#endif // GL_HPP
14 changes: 0 additions & 14 deletions include/three-dim-util/glut-wrapper.hpp

This file was deleted.

59 changes: 0 additions & 59 deletions src/glut-wrapper.cpp

This file was deleted.

0 comments on commit 9246e27

Please sign in to comment.