diff -r aeb5f203b3eb -r a5111f4e6412 CMakeLists.txt --- a/CMakeLists.txt Fri Nov 08 19:05:07 2019 +0200 +++ b/CMakeLists.txt Fri Dec 13 15:55:56 2019 +0200 @@ -10,14 +10,17 @@ find_package(Qt5OpenGL REQUIRED) find_package(Qt5Network REQUIRED) find_package(Qt5LinguistTools REQUIRED) +find_package(GLUT REQUIRED) set (CMAKE_AUTOMOC ON) find_package(OpenGL REQUIRED) include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${GLUT_INCLUDE_DIR}) set (LDFORGE_SOURCES src/document.cpp src/documentmanager.cpp src/libraries.cpp + src/invert.cpp src/main.cpp src/mainwindow.cpp src/matrix.cpp @@ -27,6 +30,8 @@ src/uiutilities.cpp src/version.cpp src/vertex.cpp + src/gl/compiler.cpp + src/gl/partrenderer.cpp src/linetypes/comment.cpp src/linetypes/conditionaledge.cpp src/linetypes/edge.cpp @@ -39,12 +44,14 @@ src/settingseditor/keyboardshortcutseditor.cpp src/settingseditor/librarieseditor.cpp src/settingseditor/settingseditor.cpp + src/types/boundingbox.cpp ) set (LDFORGE_HEADERS src/basics.h src/colors.h src/document.h src/documentmanager.h + src/invert.h src/libraries.h src/main.h src/mainwindow.h @@ -52,10 +59,14 @@ src/model.h src/modeleditcontext.h src/parser.h + src/ring.h src/uiutilities.h src/utility.h src/version.h src/vertex.h + src/gl/common.h + src/gl/compiler.h + src/gl/partrenderer.h src/linetypes/comment.h src/linetypes/conditionaledge.h src/linetypes/edge.h @@ -68,6 +79,7 @@ src/settingseditor/keyboardshortcutseditor.h src/settingseditor/librarieseditor.h src/settingseditor/settingseditor.h + src/types/boundingbox.h ) set (LDFORGE_FORMS src/document.ui @@ -127,6 +139,7 @@ set_source_files_properties(${LDFORGE_RESOURCES} PROPERTIES HEADER_FILE_ONLY TRUE) set_target_properties(ldforge PROPERTIES AUTOMOC 1) target_link_libraries(ldforge Qt5::Widgets Qt5::Network Qt5::OpenGL ${OPENGL_LIBRARIES}) +target_link_libraries(ldforge ${GLUT_LIBRARIES}) cotire(ldforge) # Collect the current hg revision into hginfo.h