X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=58b1b46c7c1615706bd94c7803d9ab52d61f0bce;hb=c5fa24956f3db8df3f658b5dc64353dede2e10ea;hp=85697073f3bd942aded53b9f5b8d33a3f5b89d7d;hpb=d6d0a1acf5897fb86d89a09fa98acf851731ec6c;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8569707..58b1b46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,10 +68,15 @@ ENDIF()
 
 SET(FREEGLUT_HEADERS
     include/GL/freeglut.h
+    include/GL/freeglut_ucall.h
     include/GL/freeglut_ext.h
     include/GL/freeglut_std.h
-    include/GL/glut.h
 )
+IF(FREEGLUT_REPLACE_GLUT)
+    LIST(APPEND FREEGLUT_SRCS
+        include/GL/glut.h
+    )
+ENDIF()
 SET(FREEGLUT_SRCS
     ${FREEGLUT_HEADERS}
     src/fg_callbacks.c
@@ -86,6 +91,7 @@ SET(FREEGLUT_SRCS
     src/fg_init.c
     src/fg_init.h
     src/fg_internal.h
+    src/fg_callback_macros.h
     src/fg_input_devices.c
     src/fg_joystick.c
     src/fg_main.c
@@ -428,18 +434,18 @@ ELSE()
     #   or special-cased FreeGLUT long ago (e.g. .so.4 on OpenBSD), so
     #   the lack of support for current:revision:age in CMake should
     #   not be a problem.
-	# - the output library should be named glut so it'll be linkable with -lglut
-	#   (unless FREEGLUT_REPLACE_GLUT is false).
+    # - the output library should be named glut so it'll be linkable with -lglut
+    #   (unless FREEGLUT_REPLACE_GLUT is false).
     # - the shared library should link to the dependency libraries so that the user
     #   won't have to link them explicitly (they shouldn't have to know that we depend
     #   on Xrandr or Xxf86vm)
     IF(FREEGLUT_GLES)
-		SET(LIBNAME freeglut-gles)
+        SET(LIBNAME freeglut-gles)
     ELSE()
-		IF(FREEGLUT_REPLACE_GLUT)
-			SET(LIBNAME glut)
-		ENDIF()
-	ENDIF()
+        IF(FREEGLUT_REPLACE_GLUT)
+            SET(LIBNAME glut)
+        ENDIF()
+    ENDIF()
 
     IF(FREEGLUT_BUILD_SHARED_LIBS)
       SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION ${SO_MAJOR}.${SO_MINOR}.${SO_REV} SOVERSION ${SO_MAJOR} OUTPUT_NAME ${LIBNAME})
@@ -478,7 +484,7 @@ IF(FREEGLUT_BUILD_SHARED_LIBS)
     IF(INSTALL_PDB)
         INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/freeglut${CMAKE_DEBUG_POSTFIX}.pdb
             DESTINATION bin
-			CONFIGURATIONS Debug
+            CONFIGURATIONS Debug
             COMPONENT Devel)
     ENDIF()
 ENDIF()
@@ -545,6 +551,7 @@ IF(UNIX)
 ENDIF()
 ADD_DEMO(subwin          progs/demos/subwin/subwin.c)
 ADD_DEMO(timer           progs/demos/timer/timer.c)
+ADD_DEMO(timer_callback  progs/demos/timer_callback/timer.c)