Merge branch 'main' of https://github.com/koppi/rm501

koppi · koppi · commit 707365e02a10 · 2025-12-23T22:13:24.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(SOURCES rm501.c trajgen.c)
 add_executable(rm501 ${SOURCES})
 
 find_package(OpenGL REQUIRED COMPONENTS OpenGL)
-#find_package(GLUT REQUIRED)
+find_package(GLUT REQUIRED)
 
 if (NOT ${OPENGL_FOUND})
    message(FATAL_ERROR "OpenGL not found")
@@ -60,5 +60,6 @@ target_link_libraries(rm501
         SDL2_ttf
         OpenGL::GL
         OpenGL::GLU
+        GLUT::GLUT
         m
 )

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ set(SOURCES rm501.c trajgen.c)`
`42`	`42`	`add_executable(rm501 ${SOURCES})`
`43`	`43`
`44`	`44`	`find_package(OpenGL REQUIRED COMPONENTS OpenGL)`
`45`		`-#find_package(GLUT REQUIRED)`
	`45`	`+find_package(GLUT REQUIRED)`
`46`	`46`
`47`	`47`	`if (NOT ${OPENGL_FOUND})`
`48`	`48`	`message(FATAL_ERROR "OpenGL not found")`
`@@ -60,5 +60,6 @@ target_link_libraries(rm501`
`60`	`60`	`SDL2_ttf`
`61`	`61`	`OpenGL::GL`
`62`	`62`	`OpenGL::GLU`
	`63`	`+ GLUT::GLUT`
`63`	`64`	`m`
`64`	`65`	`)`