X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=c25947c1f56825ed50091b2029f595cd6f7720f9;hb=6b640a617ff8c8bb6a112494d2f659c48b3692e9;hp=85795a090b3826495558c279017f5293c10ab95e;hpb=d6b0dce3cef0b00fbc2f7f1a4324e4f8755f5a3d;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85795a0..c25947c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,11 +29,11 @@ SET(FREEGLUT_SRCS
 	src/freeglut_xinput.c
 )
 
-IF(WIN32)
-	LIST(APPEND FREEGLUT_SRCS src/freeglut_windows.c)
-ELSE()
-	LIST(APPEND FREEGLUT_SRCS src/freeglut_x11.c)
-ENDIF()
+#IF(WIN32)
+#	LIST(APPEND FREEGLUT_SRCS src/freeglut_windows.c)
+#ELSE()
+#	LIST(APPEND FREEGLUT_SRCS src/freeglut_x11.c)
+#ENDIF()
 
 # Neatly organize all of the output files in the build directory
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -93,21 +93,28 @@ INSTALL(TARGETS freeglut DESTINATION lib)
 INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/include/GL" DESTINATION include
 		FILES_MATCHING PATTERN "*.h")
 
+# Optionally build demos, on by default.
+option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." ON )
+
 MACRO(ADD_DEMO name)
-	ADD_EXECUTABLE(${name} ${ARGN})
-	TARGET_LINK_LIBRARIES(${name} freeglut)
-	INSTALL(TARGETS ${name} DESTINATION bin)
+	if( FREEGLUT_BUILD_DEMOS )
+		ADD_EXECUTABLE(${name} ${ARGN})
+		TARGET_LINK_LIBRARIES(${name} freeglut)
+		INSTALL(TARGETS ${name} DESTINATION bin)
+	endif()
 ENDMACRO()
 
 ADD_DEMO(CallbackMaker   progs/demos/CallbackMaker/CallbackMaker.c)
-ADD_DEMO(Fractals        progs/demos/Fractals/Fractals.c)
-ADD_DEMO(Fractals_random progs/demos/Fractals_random/Fractals_random.c)
-ADD_DEMO(Lorenz          progs/demos/Lorenz/Lorenz.c)
-ADD_DEMO(One             progs/demos/One/One.c)
-ADD_DEMO(Resizer         progs/demos/Resizer/Resizer.c)
+ADD_DEMO(Fractals        progs/demos/Fractals/fractals.c)
+ADD_DEMO(Fractals_random progs/demos/Fractals_random/fractals_random.c)
+ADD_DEMO(Lorenz          progs/demos/Lorenz/lorenz.c)
+ADD_DEMO(One             progs/demos/One/one.c)
+ADD_DEMO(Resizer         progs/demos/Resizer/Resizer.cpp)
 ADD_DEMO(shapes          progs/demos/shapes/shapes.c)
 ADD_DEMO(smooth_opengl3  progs/demos/smooth_opengl3/smooth_opengl3.c)
-ADD_DEMO(spaceball       progs/demos/spaceball/spaceball.c)
+ADD_DEMO(spaceball       progs/demos/spaceball/spaceball.c
+                         progs/demos/spaceball/vmath.c
+                         progs/demos/spaceball/vmath.h)
 ADD_DEMO(subwin          progs/demos/subwin/subwin.c)